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

Unified Diff: chrome/browser/policy/policy_browsertest.cc

Issue 14678004: cros: Enable new cras audio handler by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: clang fix. Created 7 years, 8 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/policy/policy_browsertest.cc
diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
index 8fc55ba348add131838dbe4b7ea3a51a6b0e485c..69ba04f36f3d89512d6e136c786beefec91a22ed 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc
@@ -119,6 +119,7 @@
#include "ash/shell.h"
#include "ash/shell_delegate.h"
#include "chrome/browser/chromeos/audio/audio_handler.h"
+#include "chromeos/audio/audio_pref_handler.h"
#endif
using content::BrowserThread;
@@ -1643,8 +1644,11 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DisableScreenshotsFile) {
ASSERT_EQ(CountScreenshots(), screenshot_count + 1);
}
-IN_PROC_BROWSER_TEST_F(PolicyTest, DisableAudioOutput) {
+// TODO(rkc,jennyz): Fix this once we remove the old Audio Handler completely.
+IN_PROC_BROWSER_TEST_F(PolicyTest, DISABLED_DisableAudioOutput) {
// Set up the mock observer.
+ chromeos::AudioHandler::Initialize(
+ chromeos::AudioPrefHandler::Create(g_browser_process->local_state()));
chromeos::AudioHandler* audio_handler = chromeos::AudioHandler::GetInstance();
scoped_ptr<TestVolumeObserver> mock(new TestVolumeObserver());
audio_handler->AddVolumeObserver(mock.get());
@@ -1677,6 +1681,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DisableAudioOutput) {
EXPECT_CALL(*mock, OnMuteToggled()).Times(1);
audio_handler->SetMuted(prior_state);
audio_handler->RemoveVolumeObserver(mock.get());
+ chromeos::AudioHandler::Shutdown();
}
IN_PROC_BROWSER_TEST_F(PolicyTest, PRE_SessionLengthLimit) {

Powered by Google App Engine
This is Rietveld 408576698