diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-06 16:15:48 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-06 16:15:48 +0000 |
| commit | 19a973bb9688745a5779a3a09118a2e0d1f7aa85 (patch) | |
| tree | 7cc59808e4d569bea6e8c015e4d228c2567e3435 /chrome/browser/notifications/desktop_notifications_unittest.cc | |
| parent | aad4d0d3e185c386a5898abd56bae37c2219b11f (diff) | |
| download | chromium_src-19a973bb9688745a5779a3a09118a2e0d1f7aa85.zip chromium_src-19a973bb9688745a5779a3a09118a2e0d1f7aa85.tar.gz chromium_src-19a973bb9688745a5779a3a09118a2e0d1f7aa85.tar.bz2 | |
Revert of Enable the volume slider in Ash for windows. (https://codereview.chromium.org/178883004/)
Reason for revert:
Experimentally reverting this CL because it may have broken AshTestHelperTest.AshTestHelper on Windows Vista . Will revert the revert if this CL is innocent
See http://build.chromium.org/p/chromium.win/builders/Vista%20Tests%20%282%29/builds/41640/steps/ash_unittests/logs/AshTestHelper
Original issue's description:
> Enable the volume slider in Ash for windows.
>
> BUG=227247
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=255215
TBR=henrika@chromium.org,tommi@chromium.org,jennyz@chromium.org,dewittj@chromium.org,zturner@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=227247
Review URL: https://codereview.chromium.org/188693004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255363 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/notifications/desktop_notifications_unittest.cc')
| -rw-r--r-- | chrome/browser/notifications/desktop_notifications_unittest.cc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/chrome/browser/notifications/desktop_notifications_unittest.cc b/chrome/browser/notifications/desktop_notifications_unittest.cc index 5765fcf..742cdcc 100644 --- a/chrome/browser/notifications/desktop_notifications_unittest.cc +++ b/chrome/browser/notifications/desktop_notifications_unittest.cc @@ -107,11 +107,6 @@ DesktopNotificationsTest::~DesktopNotificationsTest() { void DesktopNotificationsTest::SetUp() { ui::InitializeInputMethodForTesting(); -#if defined(OS_WIN) && defined(USE_ASH) - // The system tray under Windows ash contains a volume slider which needs - // to talk to the audio hardware using COM. - com_initializer_.reset(new base::win::ScopedCOMInitializer()); -#endif #if defined(USE_AURA) wm_state_.reset(new views::corewm::WMState); #endif @@ -152,9 +147,6 @@ void DesktopNotificationsTest::TearDown() { #if defined(USE_AURA) wm_state_.reset(); #endif -#if defined(OS_WIN) && defined(USE_ASH) - com_initializer_.reset(); -#endif ui::ShutdownInputMethodForTesting(); } |