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

Unified Diff: chrome/browser/ui/ash/volume_controller_browsertest_chromeos.cc

Issue 14314002: Implement new audio handler which talks to the new audio dbus apis. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add comments in class header file and todo for cleaning up legacy code. 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/ui/ash/volume_controller_browsertest_chromeos.cc
diff --git a/chrome/browser/ui/ash/volume_controller_browsertest_chromeos.cc b/chrome/browser/ui/ash/volume_controller_browsertest_chromeos.cc
index 648f343b10a01d40077b35ac4348adef17a99f29..bd6fdfdbaba0f5040265038f220cea9922d0aa36 100644
--- a/chrome/browser/ui/ash/volume_controller_browsertest_chromeos.cc
+++ b/chrome/browser/ui/ash/volume_controller_browsertest_chromeos.cc
@@ -2,12 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/ui/ash/volume_controller_chromeos.h"
-
+#include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/audio/audio_handler.h"
#include "chrome/browser/chromeos/audio/audio_mixer.h"
+#include "chrome/browser/ui/ash/volume_controller_chromeos.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h"
+#include "chromeos/audio/audio_pref_handler.h"
#include "ui/base/accelerators/accelerator.h"
namespace {
@@ -84,7 +85,8 @@ class VolumeControllerTest : public InProcessBrowserTest {
// First we should shutdown the default audio handler.
chromeos::AudioHandler::Shutdown();
audio_mixer_ = new MockAudioMixer;
- chromeos::AudioHandler::InitializeForTesting(audio_mixer_);
+ chromeos::AudioHandler::InitializeForTesting(audio_mixer_,
+ chromeos::AudioPrefHandler::Create(g_browser_process->local_state()));
}
virtual void CleanUpOnMainThread() OVERRIDE {

Powered by Google App Engine
This is Rietveld 408576698