diff options
| author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-12 15:40:29 +0000 |
|---|---|---|
| committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-12 15:40:29 +0000 |
| commit | 4ab9b0d0ac2a106dfde620c3e7c6144b72621798 (patch) | |
| tree | 4d436ff426fe0689471f685e9055ea2cb393853f /ash/test | |
| parent | eed83cb0379785271ba02ac54b07d18f2ea3d71c (diff) | |
| download | chromium_src-4ab9b0d0ac2a106dfde620c3e7c6144b72621798.zip chromium_src-4ab9b0d0ac2a106dfde620c3e7c6144b72621798.tar.gz chromium_src-4ab9b0d0ac2a106dfde620c3e7c6144b72621798.tar.bz2 | |
Revert of Resubmit enable the volume slider in Ash for windows. (https://codereview.chromium.org/193173002/)
Reason for revert:
Broke ash_unittests on Vista:
http://build.chromium.org/p/chromium.win/builders/Vista%20Tests%20%282%29/builds/41713/steps/ash_unittests/logs/AshTestHelper
Original issue's description:
> Resubmit enable the volume slider in Ash for windows.
>
> BUG=227247
>
> This is a resubmit of https://codereview.chromium.org/178883004/
>
> That patch caused tests to fail on Vista due to uninitialized COM errors.
> I've uploaded this patch as a diff to that codereview as well (Patch Set 11), so you can diff Patch Set 11 against Patch Set 10 to see the fix.
>
> In words though, the fix is:
>
> 1) Don't special-case DesktopNotificationsTest for COM initialization, instead fix AuraShellTestSuite to correctly initialize COM for Win7+, not just Win8+ (since Ash is supported on Win7).
>
> 2) Make the same fix for Win7 in InProcessBrowserTest.
>
> 3) In AshTestSuiteTest, don't run the test on Vista and below since Ash isn't supported prior to Win7 (I don't know of a better way to disable this test at runtime based on OS version).
>
> TBR=henrika, jennyz
> R=sky
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=256374
TBR=sky@chromium.org,zturner@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=227247
Review URL: https://codereview.chromium.org/197513003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256531 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test')
| -rw-r--r-- | ash/test/ash_test_helper_unittest.cc | 9 | ||||
| -rw-r--r-- | ash/test/test_suite.cc | 6 |
2 files changed, 2 insertions, 13 deletions
diff --git a/ash/test/ash_test_helper_unittest.cc b/ash/test/ash_test_helper_unittest.cc index 547cafa..52e73fb 100644 --- a/ash/test/ash_test_helper_unittest.cc +++ b/ash/test/ash_test_helper_unittest.cc @@ -8,10 +8,6 @@ #include "ui/aura/window_event_dispatcher.h" #include "ui/views/widget/widget.h" -#if defined(OS_WIN) -#include "base/win/windows_version.h" -#endif - // Tests for AshTestHelper. Who will watch the watchers? And who will test // the tests? class AshTestHelperTest : public testing::Test { @@ -44,11 +40,6 @@ class AshTestHelperTest : public testing::Test { // Ensure that we have initialized enough of Ash to create and show a window. TEST_F(AshTestHelperTest, AshTestHelper) { // Check initial state. -#if defined(OS_WIN) - // Ash doesn't run on versions of Windows prior to Win7. - if (base::win::GetVersion() < base::win::VERSION_WIN7) - return; -#endif EXPECT_TRUE(ash_test_helper()->message_loop()); EXPECT_TRUE(ash_test_helper()->test_shell_delegate()); EXPECT_TRUE(ash_test_helper()->CurrentContext()); diff --git a/ash/test/test_suite.cc b/ash/test/test_suite.cc index 5b772b9..2e971eb 100644 --- a/ash/test/test_suite.cc +++ b/ash/test/test_suite.cc @@ -33,14 +33,12 @@ void AuraShellTestSuite::Initialize() { gfx::GLSurface::InitializeOneOffForTests(); #if defined(OS_WIN) - base::win::Version version = base::win::GetVersion(); - if (version >= base::win::VERSION_WIN7 && + if (base::win::GetVersion() >= base::win::VERSION_WIN8 && !CommandLine::ForCurrentProcess()->HasSwitch( ash::switches::kForceAshToDesktop)) { com_initializer_.reset(new base::win::ScopedCOMInitializer()); ui::win::CreateATLModuleIfNeeded(); - if (version >= base::win::VERSION_WIN8) - ASSERT_TRUE(win8::MakeTestDefaultBrowserSynchronously()); + ASSERT_TRUE(win8::MakeTestDefaultBrowserSynchronously()); } #endif |