We recently enabled reading sysctl values from inside the sandbox. This CL removes workarounds needed when sysctl reads where blocked.
Review URL: http://codereview.chromium.org/151202
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19809 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/base/sys_info_mac.cc b/base/sys_info_mac.cc
index 29430663..caec74d 100644
--- a/base/sys_info_mac.cc
+++ b/base/sys_info_mac.cc
@@ -12,35 +12,21 @@
void SysInfo::OperatingSystemVersionNumbers(int32 *major_version,
int32 *minor_version,
int32 *bugfix_version) {
- static bool is_initialized = false;
- static int32 major_version_cached = 0;
- static int32 minor_version_cached = 0;
- static int32 bugfix_version_cached = 0;
+ int32 major_version_cached = 0;
+ int32 minor_version_cached = 0;
+ int32 bugfix_version_cached = 0;
- if (!is_initialized) {
- // Gestalt can't be called in the sandbox, so we cache its return value.
- Gestalt(gestaltSystemVersionMajor,
- reinterpret_cast<SInt32*>(&major_version_cached));
- Gestalt(gestaltSystemVersionMinor,
- reinterpret_cast<SInt32*>(&minor_version_cached));
- Gestalt(gestaltSystemVersionBugFix,
- reinterpret_cast<SInt32*>(&bugfix_version_cached));
- is_initialized = true;
- }
+ // Gestalt can't be called in the sandbox, so we cache its return value.
+ Gestalt(gestaltSystemVersionMajor,
+ reinterpret_cast<SInt32*>(&major_version_cached));
+ Gestalt(gestaltSystemVersionMinor,
+ reinterpret_cast<SInt32*>(&minor_version_cached));
+ Gestalt(gestaltSystemVersionBugFix,
+ reinterpret_cast<SInt32*>(&bugfix_version_cached));
*major_version = major_version_cached;
*minor_version = minor_version_cached;
*bugfix_version = bugfix_version_cached;
}
-// static
-void SysInfo::CacheSysInfo() {
- // Due to startup time concerns [premature optimization?] we only cache values
- // from functions we know to be called in the renderer & fail when the sandbox
- // is enabled.
- NumberOfProcessors();
- int32 dummy;
- OperatingSystemVersionNumbers(&dummy, &dummy, &dummy);
-}
-
} // namespace base
