Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1102)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: base/test/expectations/expectation.cc

Issue 325423005: Update OS version functions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« base/mac/mac_util_unittest.mm ('K') | « base/process/memory_mac.mm ('k') | chrome/browser/chrome_browser_main_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/test/expectations/expectation.cc
diff --git a/base/test/expectations/expectation.cc b/base/test/expectations/expectation.cc
index 86ce655621d5e6ace4387578a208879ec46d7334..32a39a959b42557d637d2b052b118c787b0eeef9 100644
--- a/base/test/expectations/expectation.cc
+++ b/base/test/expectations/expectation.cc
@@ -50,7 +50,8 @@ static bool IsValidPlatform(const Platform* platform) {
variant != "10.6" &&
variant != "10.7" &&
variant != "10.8" &&
- variant != "10.9") {
+ variant != "10.9" &&
+ variant != "10.10") {
return false;
}
} else if (name == "Linux") {
@@ -111,6 +112,8 @@ Platform GetCurrentPlatform() {
platform.variant = "10.8";
else if (base::mac::IsOSMavericks())
platform.variant = "10.9";
+ else if (base::mac::IsOSYosemite())
+ platform.variant = "10.9";
Mark Mentovai 2014/06/12 18:00:27 Fix this.
Avi (use Gerrit) 2014/06/12 18:04:35 Done.
#elif defined(OS_CHROMEOS)
platform.name = "ChromeOS";
#elif defined(OS_ANDROID)
« base/mac/mac_util_unittest.mm ('K') | « base/process/memory_mac.mm ('k') | chrome/browser/chrome_browser_main_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698