4 files changed, 13 insertions, 29 deletions
diff --git a/chrome/browser/bug_report_util.cc b/chrome/browser/bug_report_util.cc
index 8be7f42..cedcbec 100644
--- a/chrome/browser/bug_report_util.cc
+++ b/chrome/browser/bug_report_util.cc
@@ -167,11 +167,7 @@ void BugReportUtil::SetOSVersion(std::string* os_version) {
   if (service_pack > 0)
     os_version->append(StringPrintf("Service Pack %d", service_pack));
 #elif defined(OS_MACOSX)
-  int32 major;
-  int32 minor;
-  int32 bugFix;
-  base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &bugFix);
-  *os_version = StringPrintf("%d.%d.%d", major, minor, bugFix);
+  *os_version = base::SysInfo::OperatingSystemVersion();
 #else
   *os_version = "unknown";
 #endif
diff --git a/chrome/browser/process_info_snapshot_mac.cc b/chrome/browser/process_info_snapshot_mac.cc
index d0387b0..74d93bf 100644
--- a/chrome/browser/process_info_snapshot_mac.cc
+++ b/chrome/browser/process_info_snapshot_mac.cc
@@ -10,9 +10,9 @@
 
 #include "base/command_line.h"
 #include "base/logging.h"
+#include "base/mac/mac_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
-#include "base/sys_info.h"
 #include "base/threading/thread.h"
 
 // Default constructor.
@@ -380,11 +380,9 @@ bool ProcessInfoSnapshot::Sample(std::vector<base::ProcessId> pid_list) {
 
   // Get memory information using top.
   bool memory_info_success = false;
-  int32 major, minor, bugfix;
-  base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &bugfix);
-  if (major == 10 && minor == 5)
+  if (base::mac::IsOSLeopardOrEarlier())
     memory_info_success = GetProcessMemoryInfoUsingTop_10_5(proc_info_entries_);
-  else if ((major == 10 && minor >= 6) || major > 10)
+  else
     memory_info_success = GetProcessMemoryInfoUsingTop(proc_info_entries_);
 
   // If top didn't work then fall back to ps.
diff --git a/chrome/browser/ui/cocoa/objc_zombie.mm b/chrome/browser/ui/cocoa/objc_zombie.mm
index d90be07..3e09736 100644
--- a/chrome/browser/ui/cocoa/objc_zombie.mm
+++ b/chrome/browser/ui/cocoa/objc_zombie.mm
@@ -11,9 +11,9 @@
 #import <objc/objc-class.h>
 
 #include "base/logging.h"
+#include "base/mac/mac_util.h"
 #include "base/metrics/histogram.h"
 #include "base/synchronization/lock.h"
-#include "base/sys_info.h"
 #import "chrome/app/breakpad_mac.h"
 #import "chrome/browser/ui/cocoa/objc_method_swizzle.h"
 
@@ -279,25 +279,19 @@ BOOL ZombieInit() {
     return YES;
 
   // Whitelist releases that are compatible with objc zombies.
-  int32 major_version = 0, minor_version = 0, bugfix_version = 0;
-  base::SysInfo::OperatingSystemVersionNumbers(
-      &major_version, &minor_version, &bugfix_version);
-
-  if (major_version < 10 || (major_version == 10 && minor_version < 5)) {
-    return NO;
-  } else if (major_version == 10 && minor_version == 5) {
+  if (base::mac::IsOSLeopard()) {
     g_objectDestruct = LookupObjectDestruct_10_5();
     if (!g_objectDestruct) {
       RecordZombieFailure(FAILED_10_5);
       return NO;
     }
-  } else if (major_version == 10 && minor_version == 6) {
+  } else if (base::mac::IsOSSnowLeopard()) {
     g_objectDestruct = LookupObjectDestruct_10_6();
     if (!g_objectDestruct) {
       RecordZombieFailure(FAILED_10_6);
       return NO;
     }
-  } else {
+  } else if (base::mac::IsOSLionOrLater()) {
     // Assume the future looks like the present.
     g_objectDestruct = LookupObjectDestruct_10_6();
 
@@ -309,6 +303,8 @@ BOOL ZombieInit() {
       RecordZombieFailure(FAILED_MAX);
       return NO;
     }
+  } else {
+    return NO;
   }
 
   Class rootClass = [NSObject class];
diff --git a/chrome/browser/ui/cocoa/wrench_menu/menu_tracked_button.mm b/chrome/browser/ui/cocoa/wrench_menu/menu_tracked_button.mm
index 3f65b36..e3e4fc1 100644
--- a/chrome/browser/ui/cocoa/wrench_menu/menu_tracked_button.mm
+++ b/chrome/browser/ui/cocoa/wrench_menu/menu_tracked_button.mm
@@ -1,10 +1,10 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/wrench_menu/menu_tracked_button.h"
 
-#include <cmath>
+#include "base/mac/mac_util.h"
 
 @interface MenuTrackedButton (Private)
 - (void)doHighlight:(BOOL)highlight;
@@ -104,15 +104,9 @@
 }
 
 - (BOOL)shouldHighlightOnHover {
-  // Apple does not define NSAppKitVersionNumber10_5 when using the 10.5 SDK.
-  // The Internets have come up with this solution.
-  #ifndef NSAppKitVersionNumber10_5
-  #define NSAppKitVersionNumber10_5 949
-  #endif
-
   // There's a cell drawing bug in 10.5 that was fixed on 10.6.  Hover states
   // look terrible due to this, so disable highlighting on 10.5.
-  return std::floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_5;
+  return base::mac::IsOSSnowLeopardOrLater();
 }
 
 @end