Merge 276752 "Update OS version functions."

base/test/expectations/expectation.cc

 // Copyright (c) 2013 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.
 
 #include "base/test/expectations/expectation.h"
 
 #include "base/logging.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
@@ skipping 32 matching lines @@
         variant != "Vista" &&
         variant != "7" &&
         variant != "8") {
       return false;
     }
   } else if (name == "Mac") {
     if (variant != "" &&
         variant != "10.6" &&
         variant != "10.7" &&
         variant != "10.8" &&
-        variant != "10.9") {
+        variant != "10.9" &&
+        variant != "10.10") {
       return false;
     }
   } else if (name == "Linux") {
     if (variant != "" &&
         variant != "32" &&
         variant != "64") {
       return false;
     }
   } else if (name == "ChromeOS") {
     // TODO(rsesek): Figure out what ChromeOS needs.
@@ skipping 40 matching lines @@
 #elif defined(OS_MACOSX)
   platform.name = "Mac";
   if (base::mac::IsOSSnowLeopard())
     platform.variant = "10.6";
   else if (base::mac::IsOSLion())
     platform.variant = "10.7";
   else if (base::mac::IsOSMountainLion())
     platform.variant = "10.8";
   else if (base::mac::IsOSMavericks())
     platform.variant = "10.9";
+  else if (base::mac::IsOSYosemite())
+    platform.variant = "10.10";
 #elif defined(OS_CHROMEOS)
   platform.name = "ChromeOS";
 #elif defined(OS_ANDROID)
   platform.name = "Android";
 #elif defined(OS_LINUX)
   platform.name = "Linux";
   std::string arch = base::SysInfo::OperatingSystemArchitecture();
   if (arch == "x86")
     platform.variant = "32";
   else if (arch == "x86_64")
@@ skipping 25 matching lines @@
 }
 
 Expectation::Expectation()
     : configuration(CONFIGURATION_UNSPECIFIED),
       result(RESULT_PASS) {
 }
 
 Expectation::~Expectation() {}
 
 }  // namespace test_expectations