base/test/expectations/expectation.cc - Issue 336163005: Merge 276752 "Update OS version functions."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 336163005: Merge 276752 "Update OS version functions." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1985/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:

Index: base/test/expectations/expectation.cc

===================================================================

--- base/test/expectations/expectation.cc (revision 278500)

+++ base/test/expectations/expectation.cc (working copy)

@@ -50,7 +50,8 @@

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.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)

« no previous file with comments | « base/process/memory_mac.mm ('k') | chrome/browser/chrome_browser_main_mac.mm » ('j') | no next file with comments »