base::mac::IsOSSierra() -> base::mac::IsOS10_12(), etc.

base/mac/mac_util_unittest.mm

Index: base/mac/mac_util_unittest.mm
diff --git a/base/mac/mac_util_unittest.mm b/base/mac/mac_util_unittest.mm
index 11003fa0bc557e58a296addd7e310d9ffda7080f..195eac7f2b6750828193bf636ea1dcc3fbf81569 100644
--- a/base/mac/mac_util_unittest.mm
+++ b/base/mac/mac_util_unittest.mm
@@ -146,48 +146,48 @@ TEST_F(MacUtilTest, IsOSEllipsis) {
 
   if (major == 10) {
     if (minor == 9) {
-      EXPECT_TRUE(IsOSMavericks());
-      EXPECT_FALSE(IsOSYosemite());
-      EXPECT_TRUE(IsOSYosemiteOrEarlier());
-      EXPECT_FALSE(IsOSYosemiteOrLater());
-      EXPECT_FALSE(IsOSElCapitan());
-      EXPECT_TRUE(IsOSElCapitanOrEarlier());
-      EXPECT_FALSE(IsOSElCapitanOrLater());
-      EXPECT_FALSE(IsOSSierra());
-      EXPECT_FALSE(IsOSSierraOrLater());
+      EXPECT_TRUE(IsOS10_9());
+      EXPECT_FALSE(IsOS10_10());
+      EXPECT_TRUE(IsAtMostOS10_10());
+      EXPECT_FALSE(IsAtLeastOS10_10());
+      EXPECT_FALSE(IsOS10_11());
+      EXPECT_TRUE(IsAtMostOS10_11());
+      EXPECT_FALSE(IsAtLeastOS10_11());
+      EXPECT_FALSE(IsOS10_12());
+      EXPECT_FALSE(IsAtLeastOS10_12());
       EXPECT_FALSE(IsOSLaterThanSierra_DontCallThis());
     } else if (minor == 10) {
-      EXPECT_FALSE(IsOSMavericks());
-      EXPECT_TRUE(IsOSYosemite());
-      EXPECT_TRUE(IsOSYosemiteOrEarlier());
-      EXPECT_TRUE(IsOSYosemiteOrLater());
-      EXPECT_FALSE(IsOSElCapitan());
-      EXPECT_TRUE(IsOSElCapitanOrEarlier());
-      EXPECT_FALSE(IsOSElCapitanOrLater());
-      EXPECT_FALSE(IsOSSierra());
-      EXPECT_FALSE(IsOSSierraOrLater());
+      EXPECT_FALSE(IsOS10_9());
+      EXPECT_TRUE(IsOS10_10());
+      EXPECT_TRUE(IsAtMostOS10_10());
+      EXPECT_TRUE(IsAtLeastOS10_10());
+      EXPECT_FALSE(IsOS10_11());
+      EXPECT_TRUE(IsAtMostOS10_11());
+      EXPECT_FALSE(IsAtLeastOS10_11());
+      EXPECT_FALSE(IsOS10_12());
+      EXPECT_FALSE(IsAtLeastOS10_12());
       EXPECT_FALSE(IsOSLaterThanSierra_DontCallThis());
     } else if (minor == 11) {
-      EXPECT_FALSE(IsOSMavericks());
-      EXPECT_FALSE(IsOSYosemite());
-      EXPECT_FALSE(IsOSYosemiteOrEarlier());
-      EXPECT_TRUE(IsOSYosemiteOrLater());
-      EXPECT_TRUE(IsOSElCapitan());
-      EXPECT_TRUE(IsOSElCapitanOrEarlier());
-      EXPECT_TRUE(IsOSElCapitanOrLater());
-      EXPECT_FALSE(IsOSSierra());
-      EXPECT_FALSE(IsOSSierraOrLater());
+      EXPECT_FALSE(IsOS10_9());
+      EXPECT_FALSE(IsOS10_10());
+      EXPECT_FALSE(IsAtMostOS10_10());
+      EXPECT_TRUE(IsAtLeastOS10_10());
+      EXPECT_TRUE(IsOS10_11());
+      EXPECT_TRUE(IsAtMostOS10_11());
+      EXPECT_TRUE(IsAtLeastOS10_11());
+      EXPECT_FALSE(IsOS10_12());
+      EXPECT_FALSE(IsAtLeastOS10_12());
       EXPECT_FALSE(IsOSLaterThanSierra_DontCallThis());
     } else if (minor == 12) {
-      EXPECT_FALSE(IsOSMavericks());
-      EXPECT_FALSE(IsOSYosemite());
-      EXPECT_FALSE(IsOSYosemiteOrEarlier());
-      EXPECT_TRUE(IsOSYosemiteOrLater());
-      EXPECT_FALSE(IsOSElCapitan());
-      EXPECT_FALSE(IsOSElCapitanOrEarlier());
-      EXPECT_TRUE(IsOSElCapitanOrLater());
-      EXPECT_TRUE(IsOSSierra());
-      EXPECT_TRUE(IsOSSierraOrLater());
+      EXPECT_FALSE(IsOS10_9());
+      EXPECT_FALSE(IsOS10_10());
+      EXPECT_FALSE(IsAtMostOS10_10());
+      EXPECT_TRUE(IsAtLeastOS10_10());
+      EXPECT_FALSE(IsOS10_11());
+      EXPECT_FALSE(IsAtMostOS10_11());
+      EXPECT_TRUE(IsAtLeastOS10_11());
+      EXPECT_TRUE(IsOS10_12());
+      EXPECT_TRUE(IsAtLeastOS10_12());
       EXPECT_FALSE(IsOSLaterThanSierra_DontCallThis());
     } else {
       // Not nine, ten, eleven, or twelve. Ah, ah, ah.