mac: Delete more 10.5-only code

BUG=137676
TBR=tony, sky

Review URL: https://chromiumcodereview.appspot.com/10837158

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150878 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 1 insertions, 39 deletions

diff --git a/base/mac/mac_util.h b/base/mac/mac_util.h
index a4053fd..ba13ff9 100644
--- a/base/mac/mac_util.h
+++ b/base/mac/mac_util.h
@@ -126,10 +126,6 @@ BASE_EXPORT bool WasLaunchedAsHiddenLoginItem();
 // "OrLater" variants to those that check for a specific version, unless you
 // know for sure that you need to check for a specific version.
 
-// Leopard is Mac OS X 10.5, Darwin 9.
-BASE_EXPORT bool IsOSLeopard();
-BASE_EXPORT bool IsOSLeopardOrEarlier();
-
 // Snow Leopard is Mac OS X 10.6, Darwin 10.
 BASE_EXPORT bool IsOSSnowLeopard();
 BASE_EXPORT bool IsOSSnowLeopardOrEarlier();
@@ -158,8 +154,6 @@ BASE_EXPORT
 #if defined(MAC_OS_X_VERSION_10_6) && \
     MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6
 #define BASE_MAC_MAC_UTIL_H_INLINED_GE_10_6
-inline bool IsOSLeopard() { return false; }
-inline bool IsOSLeopardOrEarlier() { return false; }
 inline bool IsOSSnowLeopardOrLater() { return true; }
 #endif
 
diff --git a/base/mac/mac_util.mm b/base/mac/mac_util.mm
index 0d8fe63..f6aeebe 100644
--- a/base/mac/mac_util.mm
+++ b/base/mac/mac_util.mm
@@ -560,7 +560,6 @@ int MacOSXMinorVersion() {
 }
 
 enum {
-  LEOPARD_MINOR_VERSION = 5,
   SNOW_LEOPARD_MINOR_VERSION = 6,
   LION_MINOR_VERSION = 7,
   MOUNTAIN_LION_MINOR_VERSION = 8,
@@ -568,18 +567,6 @@ enum {
 
 }  // namespace
 
-#if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GE_10_6)
-bool IsOSLeopard() {
-  return MacOSXMinorVersion() == LEOPARD_MINOR_VERSION;
-}
-#endif
-
-#if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GE_10_6)
-bool IsOSLeopardOrEarlier() {
-  return MacOSXMinorVersion() <= LEOPARD_MINOR_VERSION;
-}
-#endif
-
 #if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GE_10_7)
 bool IsOSSnowLeopard() {
   return MacOSXMinorVersion() == SNOW_LEOPARD_MINOR_VERSION;
diff --git a/base/mac/mac_util_unittest.mm b/base/mac/mac_util_unittest.mm
index b09d685..94ec5bd 100644
--- a/base/mac/mac_util_unittest.mm
+++ b/base/mac/mac_util_unittest.mm
@@ -151,22 +151,7 @@ TEST_F(MacUtilTest, IsOSEllipsis) {
   base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &bugfix);
 
   if (major == 10) {
-    if (minor == 5) {
-      EXPECT_TRUE(IsOSLeopard());
-      EXPECT_TRUE(IsOSLeopardOrEarlier());
-      EXPECT_FALSE(IsOSSnowLeopard());
-      EXPECT_TRUE(IsOSSnowLeopardOrEarlier());
-      EXPECT_FALSE(IsOSSnowLeopardOrLater());
-      EXPECT_FALSE(IsOSLion());
-      EXPECT_TRUE(IsOSLionOrEarlier());
-      EXPECT_FALSE(IsOSLionOrLater());
-      EXPECT_FALSE(IsOSMountainLion());
-      EXPECT_FALSE(IsOSMountainLionOrLater());
-      EXPECT_FALSE(
-          IsOSDangerouslyLaterThanMountainLionForUseByCFAllocatorReplacement());
-    } else if (minor == 6) {
-      EXPECT_FALSE(IsOSLeopard());
-      EXPECT_FALSE(IsOSLeopardOrEarlier());
+    if (minor == 6) {
       EXPECT_TRUE(IsOSSnowLeopard());
       EXPECT_TRUE(IsOSSnowLeopardOrEarlier());
       EXPECT_TRUE(IsOSSnowLeopardOrLater());
@@ -178,8 +163,6 @@ TEST_F(MacUtilTest, IsOSEllipsis) {
       EXPECT_FALSE(
           IsOSDangerouslyLaterThanMountainLionForUseByCFAllocatorReplacement());
     } else if (minor == 7) {
-      EXPECT_FALSE(IsOSLeopard());
-      EXPECT_FALSE(IsOSLeopardOrEarlier());
       EXPECT_FALSE(IsOSSnowLeopard());
       EXPECT_FALSE(IsOSSnowLeopardOrEarlier());
       EXPECT_TRUE(IsOSSnowLeopardOrLater());
@@ -191,8 +174,6 @@ TEST_F(MacUtilTest, IsOSEllipsis) {
       EXPECT_FALSE(
           IsOSDangerouslyLaterThanMountainLionForUseByCFAllocatorReplacement());
     } else if (minor == 8) {
-      EXPECT_FALSE(IsOSLeopard());
-      EXPECT_FALSE(IsOSLeopardOrEarlier());
       EXPECT_FALSE(IsOSSnowLeopard());
       EXPECT_FALSE(IsOSSnowLeopardOrEarlier());
       EXPECT_TRUE(IsOSSnowLeopardOrLater());