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

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 <stddef.h>
 #include <stdint.h>
 
 #include "base/mac/mac_util.h"
 
@@ skipping 128 matching lines @@
   NSObjectRelease(array);
   EXPECT_EQ(1U, [array retainCount]);
 }
 
 TEST_F(MacUtilTest, IsOSEllipsis) {
   int32_t major, minor, bugfix;
   base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &bugfix);
 
   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.
       EXPECT_TRUE(false);
     }
   } else {
     // Not ten. What you gonna do?
     EXPECT_FALSE(true);
   }
 }
@@ skipping 56 matching lines @@
   ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
   FilePath non_existent_path = temp_dir_.path().Append("DummyPath");
   ASSERT_FALSE(PathExists(non_existent_path));
   EXPECT_FALSE(RemoveQuarantineAttribute(non_existent_path));
 }
 
 }  // namespace
 
 }  // namespace mac
 }  // namespace base