From 59e82f0e04c380286ba38d77d0f244c777c9c74d Mon Sep 17 00:00:00 2001
From: "thakis@chromium.org"
 <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 10 Aug 2012 22:47:14 +0000
Subject: mac: Remove more 10.5-only code

BUG=137676
TBR=jamiewalch,tony

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151142 0039d316-1c4b-4281-b951-d872f2087c98
---
 base/mac/mac_util.h           |  9 ---------
 base/mac/mac_util.mm          | 14 +-------------
 base/mac/mac_util_unittest.mm |  6 ------
 3 files changed, 1 insertion(+), 28 deletions(-)

(limited to 'base/mac')

diff --git a/base/mac/mac_util.h b/base/mac/mac_util.h
index ba13ff9..1b75167 100644
--- a/base/mac/mac_util.h
+++ b/base/mac/mac_util.h
@@ -128,8 +128,6 @@ BASE_EXPORT bool WasLaunchedAsHiddenLoginItem();
 
 // Snow Leopard is Mac OS X 10.6, Darwin 10.
 BASE_EXPORT bool IsOSSnowLeopard();
-BASE_EXPORT bool IsOSSnowLeopardOrEarlier();
-BASE_EXPORT bool IsOSSnowLeopardOrLater();
 
 // Lion is Mac OS X 10.7, Darwin 11.
 BASE_EXPORT bool IsOSLion();
@@ -151,17 +149,10 @@ BASE_EXPORT
 // constant-value inline functions. The MAC_OS_X_VERSION_MIN_REQUIRED macro
 // contains the value of the deployment target.
 
-#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 IsOSSnowLeopardOrLater() { return true; }
-#endif
-
 #if defined(MAC_OS_X_VERSION_10_7) && \
     MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7
 #define BASE_MAC_MAC_UTIL_H_INLINED_GE_10_7
 inline bool IsOSSnowLeopard() { return false; }
-inline bool IsOSSnowLeopardOrEarlier() { return false; }
 inline bool IsOSLionOrLater() { return true; }
 #endif
 
diff --git a/base/mac/mac_util.mm b/base/mac/mac_util.mm
index f6aeebe..a0aa72c 100644
--- a/base/mac/mac_util.mm
+++ b/base/mac/mac_util.mm
@@ -475,7 +475,7 @@ bool WasLaunchedAsHiddenLoginItem() {
   if (!item.get()) {
     // Lion can launch items for the resume feature.  So log an error only for
     // Snow Leopard or earlier.
-    if (IsOSSnowLeopardOrEarlier())
+    if (IsOSSnowLeopard())
       DLOG(ERROR) <<
           "Process launched at Login but can't access Login Item List.";
 
@@ -573,18 +573,6 @@ bool IsOSSnowLeopard() {
 }
 #endif
 
-#if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GE_10_7)
-bool IsOSSnowLeopardOrEarlier() {
-  return MacOSXMinorVersion() <= SNOW_LEOPARD_MINOR_VERSION;
-}
-#endif
-
-#if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GE_10_6)
-bool IsOSSnowLeopardOrLater() {
-  return MacOSXMinorVersion() >= SNOW_LEOPARD_MINOR_VERSION;
-}
-#endif
-
 #if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GT_10_7)
 bool IsOSLion() {
   return MacOSXMinorVersion() == LION_MINOR_VERSION;
diff --git a/base/mac/mac_util_unittest.mm b/base/mac/mac_util_unittest.mm
index 94ec5bd..f239036 100644
--- a/base/mac/mac_util_unittest.mm
+++ b/base/mac/mac_util_unittest.mm
@@ -153,8 +153,6 @@ TEST_F(MacUtilTest, IsOSEllipsis) {
   if (major == 10) {
     if (minor == 6) {
       EXPECT_TRUE(IsOSSnowLeopard());
-      EXPECT_TRUE(IsOSSnowLeopardOrEarlier());
-      EXPECT_TRUE(IsOSSnowLeopardOrLater());
       EXPECT_FALSE(IsOSLion());
       EXPECT_TRUE(IsOSLionOrEarlier());
       EXPECT_FALSE(IsOSLionOrLater());
@@ -164,8 +162,6 @@ TEST_F(MacUtilTest, IsOSEllipsis) {
           IsOSDangerouslyLaterThanMountainLionForUseByCFAllocatorReplacement());
     } else if (minor == 7) {
       EXPECT_FALSE(IsOSSnowLeopard());
-      EXPECT_FALSE(IsOSSnowLeopardOrEarlier());
-      EXPECT_TRUE(IsOSSnowLeopardOrLater());
       EXPECT_TRUE(IsOSLion());
       EXPECT_TRUE(IsOSLionOrEarlier());
       EXPECT_TRUE(IsOSLionOrLater());
@@ -175,8 +171,6 @@ TEST_F(MacUtilTest, IsOSEllipsis) {
           IsOSDangerouslyLaterThanMountainLionForUseByCFAllocatorReplacement());
     } else if (minor == 8) {
       EXPECT_FALSE(IsOSSnowLeopard());
-      EXPECT_FALSE(IsOSSnowLeopardOrEarlier());
-      EXPECT_TRUE(IsOSSnowLeopardOrLater());
       EXPECT_FALSE(IsOSLion());
       EXPECT_FALSE(IsOSLionOrEarlier());
       EXPECT_TRUE(IsOSLionOrLater());
-- 
cgit v1.1