Merge 276752 "Update OS version functions."

chrome/browser/chrome_browser_main_mac.mm

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/chrome_browser_main_mac.h"
 
 #import <Cocoa/Cocoa.h>
 #include <sys/sysctl.h>
 
 #include "apps/app_shim/app_shim_host_manager_mac.h"
@@ skipping 42 matching lines @@
   // DON'T add new constants here. It's important to keep the constant values,
   // um, constant. Add new constants at the bottom.
 
   // What if the bitsiness of the CPU can't be determined?
   SABER_TOOTHED_CAT_DUNNO,
   SNOW_LEOPARD_DUNNO,
   LION_DUNNO,
   MOUNTAIN_LION_DUNNO,
   MAVERICKS_DUNNO,
 
+  // More known cats.
+  YOSEMITE_32,  // Unexpected, Yosemite requires a 64-bit CPU.
+  YOSEMITE_64,
+  YOSEMITE_DUNNO,
+
   // Newer than any known cat.
   FUTURE_CAT_32,  // Unexpected, it's unlikely Apple will un-obsolete old CPUs.
   FUTURE_CAT_64,
   FUTURE_CAT_DUNNO,
 
   // As new versions of Mac OS X are released with sillier and sillier names,
   // rename the FUTURE_CAT enum values to match those names, and re-create
   // FUTURE_CAT_[32|64|DUNNO] here.
 
   CAT_SIXTY_FOUR_MAX
@@ skipping 33 matching lines @@
                          LION_DUNNO;
   }
   if (base::mac::IsOSMountainLion()) {
     return cpu64_known ? (cpu64 ? MOUNTAIN_LION_64 : MOUNTAIN_LION_32) :
                          MOUNTAIN_LION_DUNNO;
   }
   if (base::mac::IsOSMavericks()) {
     return cpu64_known ? (cpu64 ? MAVERICKS_64 : MAVERICKS_32) :
                          MAVERICKS_DUNNO;
   }
-  if (base::mac::IsOSLaterThanMavericks_DontCallThis()) {
+  if (base::mac::IsOSYosemite()) {
+    return cpu64_known ? (cpu64 ? YOSEMITE_64 : YOSEMITE_32) :
+                         YOSEMITE_DUNNO;
+  }
+  if (base::mac::IsOSLaterThanYosemite_DontCallThis()) {
     return cpu64_known ? (cpu64 ? FUTURE_CAT_64 : FUTURE_CAT_32) :
                          FUTURE_CAT_DUNNO;
   }
 
   // If it's not any of the expected OS versions or later than them, it must
   // be prehistoric.
   return cpu64_known ? (cpu64 ? SABER_TOOTHED_CAT_64 : SABER_TOOTHED_CAT_32) :
                        SABER_TOOTHED_CAT_DUNNO;
 }
 
@@ skipping 129 matching lines @@
 void ChromeBrowserMainPartsMac::PostProfileInit() {
   ChromeBrowserMainPartsPosix::PostProfileInit();
   g_browser_process->metrics_service()->RecordBreakpadRegistration(
       breakpad::IsCrashReporterEnabled());
 }
 
 void ChromeBrowserMainPartsMac::DidEndMainMessageLoop() {
   AppController* appController = [NSApp delegate];
   [appController didEndMainMessageLoop];
 }