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

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

Issue 1224283006: Update OS version functions for OS X 10.11 El Capitan. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 5 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/process/memory_mac.mm ('K') | « base/process/memory_mac.mm ('k') | no next file » | 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 30817791dd2da22d4f612c0959cd0864ae3f9a6c..f6c40bc114ea921ce5ebb3307550e1679dd7c344 100644
--- a/base/test/expectations/expectation.cc
+++ b/base/test/expectations/expectation.cc
@@ -51,7 +51,8 @@ static bool IsValidPlatform(const Platform* platform) {
variant != "10.7" &&
variant != "10.8" &&
variant != "10.9" &&
- variant != "10.10") {
+ variant != "10.10" &&
+ variant != "10.11") {
return false;
}
} else if (name == "Linux") {
@@ -114,6 +115,8 @@ Platform GetCurrentPlatform() {
platform.variant = "10.9";
else if (base::mac::IsOSYosemite())
platform.variant = "10.10";
+ else if (base::mac::IsOSElCapitan())
+ platform.variant = "10.11";
#elif defined(OS_CHROMEOS)
platform.name = "ChromeOS";
#elif defined(OS_ANDROID)
« base/process/memory_mac.mm ('K') | « base/process/memory_mac.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698