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

Unified Diff: chrome/test/base/in_process_browser_test.cc

Issue 178883004: Enable the volume slider in Ash for windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix COM initialization errors (the right way). Created 6 years, 9 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
« no previous file with comments | « ash/test/test_suite.cc ('k') | media/audio/win/core_audio_util_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/in_process_browser_test.cc
diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_process_browser_test.cc
index 099689b12ceb68c31a7725f0636415cf49828a99..9dad26d8eccfce2a0be737851b46fc9452786f10 100644
--- a/chrome/test/base/in_process_browser_test.cc
+++ b/chrome/test/base/in_process_browser_test.cc
@@ -202,11 +202,13 @@ void InProcessBrowserTest::SetUp() {
google_util::SetMockLinkDoctorBaseURLForTesting();
#if defined(OS_WIN)
- if (base::win::GetVersion() >= base::win::VERSION_WIN8 &&
+ base::win::Version version = base::win::GetVersion();
+ if (version >= base::win::VERSION_WIN7 &&
CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) {
com_initializer_.reset(new base::win::ScopedCOMInitializer());
ui::win::CreateATLModuleIfNeeded();
- ASSERT_TRUE(win8::MakeTestDefaultBrowserSynchronously());
+ if (version >= base::win::VERSION_WIN8)
+ ASSERT_TRUE(win8::MakeTestDefaultBrowserSynchronously());
}
#endif
« no previous file with comments | « ash/test/test_suite.cc ('k') | media/audio/win/core_audio_util_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698