Merge trunk r166585 to the 24.0.1312 branch.

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 <string.h>
 #include <sys/utsname.h>
@@ skipping 586 matching lines @@
 }
 #endif
 
 #if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GE_10_8)
 bool IsOSMountainLionOrLater() {
   return MacOSXMinorVersion() >= MOUNTAIN_LION_MINOR_VERSION;
 }
 #endif
 
 #if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GT_10_8)
-bool IsOSDangerouslyLaterThanMountainLionForUseByCFAllocatorReplacement() {
+bool IsOSLaterThanMountainLion_DontCallThis() {
   return MacOSXMinorVersion() > MOUNTAIN_LION_MINOR_VERSION;
 }
 #endif
 
 namespace {
 
 // ScopedGenericObj functor for IOObjectRelease().
 class ScopedReleaseIOObject {
  public:
   void operator()(io_object_t x) const {
@@ skipping 39 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