Improve and unify Mac OS X run-time version checks

content/renderer/renderer_main.cc

 // 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.
 
-#if defined(OS_MACOSX)
-#include <signal.h>
-#include <unistd.h>
-#endif  // OS_MACOSX
-
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/i18n/rtl.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/memory/ref_counted.h"
 #include "base/metrics/field_trial.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/stats_counters.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
 #include "base/system_monitor/system_monitor.h"
 #include "base/threading/platform_thread.h"
 #include "base/time.h"
 #include "content/common/content_counters.h"
 #include "content/common/content_switches.h"
 #include "content/common/main_function_params.h"
 #include "content/common/hi_res_timer_manager.h"
 #include "content/common/pepper_plugin_registry.h"
 #include "content/renderer/render_process_impl.h"
 #include "content/renderer/render_thread.h"
 #include "content/renderer/renderer_main_platform_delegate.h"
 #include "ui/base/ui_base_switches.h"
 
 #if defined(OS_MACOSX)
-#include <Carbon/Carbon.h>  // TISCreateInputSourceList
+#include <Carbon/Carbon.h>
+#include <signal.h>
+#include <unistd.h>
 
-#include "base/sys_info.h"
+#include "base/mac/mac_util.h"
 #include "third_party/mach_override/mach_override.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #endif  // OS_MACOSX
 
 #if defined(OS_MACOSX)
 namespace {
 
 CFArrayRef ChromeTISCreateInputSourceList(
    CFDictionaryRef properties,
    Boolean includeAllInstalled) {
   CFTypeRef values[] = { CFSTR("") };
   return CFArrayCreate(
       kCFAllocatorDefault, values, arraysize(values), &kCFTypeArrayCallBacks);
 }
 
 void InstallFrameworkHacks() {
-  int32 os_major, os_minor, os_bugfix;
-  base::SysInfo::OperatingSystemVersionNumbers(
-      &os_major, &os_minor, &os_bugfix);
-
   // See http://crbug.com/31225
   // TODO: Don't do this on newer OS X revisions that have a fix for
   // http://openradar.appspot.com/radar?id=1156410
-  if (os_major == 10 && os_minor >= 6) {
+  if (base::mac::IsOSSnowLeopardOrLater()) {
     // Chinese Handwriting was introduced in 10.6. Since doing this override
     // regresses page cycler memory usage on 10.5, don't do the unnecessary
     // override there.
     mach_error_t err = mach_override_ptr(
         (void*)&TISCreateInputSourceList,
         (void*)&ChromeTISCreateInputSourceList,
         NULL);
     CHECK_EQ(err_none, err);
   }
 }
@@ skipping 160 matching lines @@
         pool->Recycle();
       TRACE_EVENT_BEGIN_ETW("RendererMain.START_MSG_LOOP", 0, 0);
       MessageLoop::current()->Run();
       TRACE_EVENT_END_ETW("RendererMain.START_MSG_LOOP", 0, 0);
     }
   }
   platform.PlatformUninitialize();
   TRACE_EVENT_END_ETW("RendererMain", 0, "");
   return 0;
 }