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

Unified Diff: chrome/browser/notifications/desktop_notifications_unittest.cc

Issue 188693004: Revert of Enable the volume slider in Ash for windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
Index: chrome/browser/notifications/desktop_notifications_unittest.cc
diff --git a/chrome/browser/notifications/desktop_notifications_unittest.cc b/chrome/browser/notifications/desktop_notifications_unittest.cc
index 5765fcf67a3748c00efd4ca616ef12a4d9a92052..742cdcc5511f0a7959903f1a6b8b8336ab00169e 100644
--- a/chrome/browser/notifications/desktop_notifications_unittest.cc
+++ b/chrome/browser/notifications/desktop_notifications_unittest.cc
@@ -107,11 +107,6 @@
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
@@ -151,9 +146,6 @@
#endif
#if defined(USE_AURA)
wm_state_.reset();
-#endif
-#if defined(OS_WIN) && defined(USE_ASH)
- com_initializer_.reset();
#endif
ui::ShutdownInputMethodForTesting();
}
« no previous file with comments | « chrome/browser/notifications/desktop_notifications_unittest.h ('k') | media/audio/win/core_audio_util_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698