Update //base to chromium 9659b08ea5a34f889dc4166217f438095ddc10d2

base/mac/mac_util.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 "base/mac/mac_util.h"
 
 #import <Cocoa/Cocoa.h>
 #import <IOKit/IOKitLib.h>
 
 #include <errno.h>
@@ skipping 465 matching lines @@
   static int mac_os_x_minor_version = MacOSXMinorVersionInternal();
   return mac_os_x_minor_version;
 }
 
 enum {
   SNOW_LEOPARD_MINOR_VERSION = 6,
   LION_MINOR_VERSION = 7,
   MOUNTAIN_LION_MINOR_VERSION = 8,
   MAVERICKS_MINOR_VERSION = 9,
   YOSEMITE_MINOR_VERSION = 10,
+  EL_CAPITAN_MINOR_VERSION = 11,
 };
 
 }  // namespace
 
 #if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GE_10_7)
 bool IsOSSnowLeopard() {
   return MacOSXMinorVersion() == SNOW_LEOPARD_MINOR_VERSION;
 }
 #endif
 
@@ skipping 44 matching lines @@
   return MacOSXMinorVersion() >= YOSEMITE_MINOR_VERSION;
 }
 #endif
 
 #if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GT_10_10)
 bool IsOSLaterThanYosemite_DontCallThis() {
   return MacOSXMinorVersion() > YOSEMITE_MINOR_VERSION;
 }
 #endif
 
+#if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GT_10_11)
+bool IsOSElCapitan() {
+  return MacOSXMinorVersion() == EL_CAPITAN_MINOR_VERSION;
+}
+#endif
+
+#if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GE_10_11)
+bool IsOSElCapitanOrLater() {
+  return MacOSXMinorVersion() >= EL_CAPITAN_MINOR_VERSION;
+}
+#endif
+
 std::string GetModelIdentifier() {
   std::string return_string;
   ScopedIOObject<io_service_t> platform_expert(
       IOServiceGetMatchingService(kIOMasterPortDefault,
                                   IOServiceMatching("IOPlatformExpertDevice")));
   if (platform_expert) {
     ScopedCFTypeRef<CFDataRef> model_data(
         static_cast<CFDataRef>(IORegistryEntryCreateCFProperty(
             platform_expert,
             CFSTR("model"),
@@ skipping 25 matching lines @@
           StringPiece(begin + comma_loc + 1, ident.end()), &minor_tmp))
     return false;
   *type = ident.substr(0, number_loc);
   *major = major_tmp;
   *minor = minor_tmp;
   return true;
 }
 
 }  // namespace mac
 }  // namespace base