summaryrefslogtreecommitdiffstats
path: root/chrome/browser/prefs
diff options
context:
space:
mode:
authorjennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-01 00:18:23 +0000
committerjennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-01 00:18:23 +0000
commit934e3c950dad11ddc4198005ea2bc5ec6df3a5ec (patch)
tree3464d1eb729f5f34e0c4533d2b17ec75357a6dbc /chrome/browser/prefs
parent6b471f2f47106e5bdcbc5fd4c93d16c2715ac9d7 (diff)
downloadchromium_src-934e3c950dad11ddc4198005ea2bc5ec6df3a5ec.zip
chromium_src-934e3c950dad11ddc4198005ea2bc5ec6df3a5ec.tar.gz
chromium_src-934e3c950dad11ddc4198005ea2bc5ec6df3a5ec.tar.bz2
Remove old audio handler code.
Migrate the test cases to use CrasAudioHandler. Re-enabled PolicyTest.DisableAudioOutput, and fixed an issue found with this test case. BUG=233310 TBR=derat@chromium.org, rkc@chromium.org Review URL: https://codereview.chromium.org/21380002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214877 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs')
-rw-r--r--chrome/browser/prefs/browser_prefs.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 19c2fef..af477f0 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -123,7 +123,6 @@
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
#include "chrome/browser/chromeos/audio/audio_devices_pref_handler_impl.h"
-#include "chrome/browser/chromeos/audio/audio_handler.h"
#include "chrome/browser/chromeos/audio/audio_pref_handler_impl.h"
#include "chrome/browser/chromeos/customization_document.h"
#include "chrome/browser/chromeos/display/display_preferences.h"