Revert 170800 - Speculatively reverting 166585 to see if it fixes issue 160300 - 6% startup regres…

base/mac/mac_util_unittest.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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/mac/mac_util.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 140 matching lines @@
   base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &bugfix);
 
   if (major == 10) {
     if (minor == 6) {
       EXPECT_TRUE(IsOSSnowLeopard());
       EXPECT_FALSE(IsOSLion());
       EXPECT_TRUE(IsOSLionOrEarlier());
       EXPECT_FALSE(IsOSLionOrLater());
       EXPECT_FALSE(IsOSMountainLion());
       EXPECT_FALSE(IsOSMountainLionOrLater());
-      EXPECT_FALSE(
-          IsOSDangerouslyLaterThanMountainLionForUseByCFAllocatorReplacement());
+      EXPECT_FALSE(IsOSLaterThanMountainLion_DontCallThis());
     } else if (minor == 7) {
       EXPECT_FALSE(IsOSSnowLeopard());
       EXPECT_TRUE(IsOSLion());
       EXPECT_TRUE(IsOSLionOrEarlier());
       EXPECT_TRUE(IsOSLionOrLater());
       EXPECT_FALSE(IsOSMountainLion());
       EXPECT_FALSE(IsOSMountainLionOrLater());
-      EXPECT_FALSE(
-          IsOSDangerouslyLaterThanMountainLionForUseByCFAllocatorReplacement());
+      EXPECT_FALSE(IsOSLaterThanMountainLion_DontCallThis());
     } else if (minor == 8) {
       EXPECT_FALSE(IsOSSnowLeopard());
       EXPECT_FALSE(IsOSLion());
       EXPECT_FALSE(IsOSLionOrEarlier());
       EXPECT_TRUE(IsOSLionOrLater());
       EXPECT_TRUE(IsOSMountainLion());
       EXPECT_TRUE(IsOSMountainLionOrLater());
-      EXPECT_FALSE(
-          IsOSDangerouslyLaterThanMountainLionForUseByCFAllocatorReplacement());
+      EXPECT_FALSE(IsOSLaterThanMountainLion_DontCallThis());
     } else {
       // Not five, six, seven, or eight. Ah, ah, ah.
       EXPECT_TRUE(false);
     }
   } else {
     // Not ten. What you gonna do?
     EXPECT_FALSE(true);
   }
 }
 
@@ skipping 15 matching lines @@
   EXPECT_TRUE(ParseModelIdentifier("MacBookPro6,2", &model, &major, &minor));
   EXPECT_EQ(model, "MacBookPro");
   EXPECT_EQ(6, major);
   EXPECT_EQ(2, minor);
 }
 
 }  // namespace
 
 }  // namespace mac
 }  // namespace base