cros: Enable new cras audio handler by default

chrome/browser/ui/ash/volume_controller_browsertest_chromeos.cc

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 bd6fdfdbaba0f5040265038f220cea9922d0aa36..3eb5b7031dbbc74c23006ad3115a88e46d10411a 100644
--- a/chrome/browser/ui/ash/volume_controller_browsertest_chromeos.cc
+++ b/chrome/browser/ui/ash/volume_controller_browsertest_chromeos.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "ash/ash_switches.h"
+#include "base/command_line.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/audio/audio_handler.h"
 #include "chrome/browser/chromeos/audio/audio_mixer.h"
@@ -13,6 +15,11 @@
 
 namespace {
 
+void SetupSwitch() {

[James Cook, 2013/04/30 20:55:05]

InProcessBrowserTest via BrowserTestBase has a SetUpCommandLine() you can use
for this sort of thing.

[rkc, 2013/04/30 23:04:57]

Done.

+  CommandLine::ForCurrentProcess()->AppendSwitch(
+      ash::switches::kAshDisableNewAudioHandler);
+}
+
 // Default volume as a percentage in the range [0.0, 100.0].
 const double kDefaultVolumePercent = 75.0;
 
@@ -80,7 +87,6 @@ class MockAudioMixer : public chromeos::AudioMixer {
 class VolumeControllerTest : public InProcessBrowserTest {
  public:
   VolumeControllerTest() {}
-
   virtual void SetUpOnMainThread() OVERRIDE {
     // First we should shutdown the default audio handler.
     chromeos::AudioHandler::Shutdown();
@@ -125,6 +131,7 @@ class VolumeControllerTest : public InProcessBrowserTest {
 };
 
 IN_PROC_BROWSER_TEST_F(VolumeControllerTest, VolumeUpAndDown) {
+  SetupSwitch();
   // Set initial value as 50%
   audio_mixer()->SetVolumePercent(50.0);
 
@@ -139,6 +146,7 @@ IN_PROC_BROWSER_TEST_F(VolumeControllerTest, VolumeUpAndDown) {
 }
 
 IN_PROC_BROWSER_TEST_F(VolumeControllerTest, VolumeDownToZero) {
+  SetupSwitch();
   // Setting to very small
   audio_mixer()->SetVolumePercent(0.1);
 
@@ -151,6 +159,7 @@ IN_PROC_BROWSER_TEST_F(VolumeControllerTest, VolumeDownToZero) {
 }
 
 IN_PROC_BROWSER_TEST_F(VolumeControllerTest, VolumeAutoMute) {
+  SetupSwitch();
   // Setting to very small
 
   // kMuteThresholdPercent = 0.1 in audio_handler.cc.
@@ -160,6 +169,7 @@ IN_PROC_BROWSER_TEST_F(VolumeControllerTest, VolumeAutoMute) {
 }
 
 IN_PROC_BROWSER_TEST_F(VolumeControllerTest, VolumeUnmuteFromZero) {
+  SetupSwitch();
   // Setting to 0%
   audio_mixer()->SetVolumePercent(0.0);
 
@@ -170,6 +180,7 @@ IN_PROC_BROWSER_TEST_F(VolumeControllerTest, VolumeUnmuteFromZero) {
 }
 
 IN_PROC_BROWSER_TEST_F(VolumeControllerTest, VolumeUpTo100) {
+  SetupSwitch();
   // Setting to almost max
   audio_mixer()->SetVolumePercent(99.0);
 
@@ -182,6 +193,7 @@ IN_PROC_BROWSER_TEST_F(VolumeControllerTest, VolumeUpTo100) {
 }
 
 IN_PROC_BROWSER_TEST_F(VolumeControllerTest, Mutes) {
+  SetupSwitch();
   ASSERT_FALSE(audio_mixer()->IsMuted());
   double initial_volume = audio_mixer()->GetVolumePercent();