cros: Enable new cras audio handler by default

chrome/browser/ui/ash/volume_controller_browsertest_chromeos.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // 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"
 #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 {
 
+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;
 
 class MockAudioMixer : public chromeos::AudioMixer {
  public:
   MockAudioMixer()
       : volume_(kDefaultVolumePercent),
         is_muted_(false) {
   }
 
@@ skipping 47 matching lines @@
   bool is_capture_muted_;
   bool is_capture_mute_locked_;
 
   DISALLOW_COPY_AND_ASSIGN(MockAudioMixer);
 };
 
 // This class has to be browsertest because AudioHandler uses prefs_service.
 class VolumeControllerTest : public InProcessBrowserTest {
  public:
   VolumeControllerTest() {}
-
   virtual void SetUpOnMainThread() OVERRIDE {
     // First we should shutdown the default audio handler.
     chromeos::AudioHandler::Shutdown();
     audio_mixer_ = new MockAudioMixer;
     chromeos::AudioHandler::InitializeForTesting(audio_mixer_,
         chromeos::AudioPrefHandler::Create(g_browser_process->local_state()));
   }
 
   virtual void CleanUpOnMainThread() OVERRIDE {
     chromeos::AudioHandler::Shutdown();
@@ skipping 24 matching lines @@
   MockAudioMixer* audio_mixer() { return audio_mixer_; }
 
  private:
   VolumeController volume_controller_;
   MockAudioMixer* audio_mixer_;
 
   DISALLOW_COPY_AND_ASSIGN(VolumeControllerTest);
 };
 
 IN_PROC_BROWSER_TEST_F(VolumeControllerTest, VolumeUpAndDown) {
+  SetupSwitch();
   // Set initial value as 50%
   audio_mixer()->SetVolumePercent(50.0);
 
   double initial_volume = audio_mixer()->GetVolumePercent();
 
   VolumeUp();
   EXPECT_LT(initial_volume, audio_mixer()->GetVolumePercent());
   VolumeDown();
   EXPECT_DOUBLE_EQ(initial_volume, audio_mixer()->GetVolumePercent());
   VolumeDown();
   EXPECT_GT(initial_volume, audio_mixer()->GetVolumePercent());
 }
 
 IN_PROC_BROWSER_TEST_F(VolumeControllerTest, VolumeDownToZero) {
+  SetupSwitch();
   // Setting to very small
   audio_mixer()->SetVolumePercent(0.1);
 
   VolumeDown();
   EXPECT_DOUBLE_EQ(0.0, audio_mixer()->GetVolumePercent());
   VolumeDown();
   EXPECT_DOUBLE_EQ(0.0, audio_mixer()->GetVolumePercent());
   VolumeUp();
   EXPECT_LT(0.0, audio_mixer()->GetVolumePercent());
 }
 
 IN_PROC_BROWSER_TEST_F(VolumeControllerTest, VolumeAutoMute) {
+  SetupSwitch();
   // Setting to very small
 
   // kMuteThresholdPercent = 0.1 in audio_handler.cc.
   SetVolumePercent(0.1);
   EXPECT_EQ(0.0, audio_mixer()->GetVolumePercent());
   EXPECT_TRUE(audio_mixer()->IsMuted());
 }
 
 IN_PROC_BROWSER_TEST_F(VolumeControllerTest, VolumeUnmuteFromZero) {
+  SetupSwitch();
   // Setting to 0%
   audio_mixer()->SetVolumePercent(0.0);
 
   VolumeUnmute();
   EXPECT_EQ(4.0 /* kDefaultUnmuteVolumePercent in audio_handler.cc */,
             audio_mixer()->GetVolumePercent());
   EXPECT_FALSE(audio_mixer()->IsMuted());
 }
 
 IN_PROC_BROWSER_TEST_F(VolumeControllerTest, VolumeUpTo100) {
+  SetupSwitch();
   // Setting to almost max
   audio_mixer()->SetVolumePercent(99.0);
 
   VolumeUp();
   EXPECT_DOUBLE_EQ(100.0, audio_mixer()->GetVolumePercent());
   VolumeUp();
   EXPECT_DOUBLE_EQ(100.0, audio_mixer()->GetVolumePercent());
   VolumeDown();
   EXPECT_GT(100.0, audio_mixer()->GetVolumePercent());
 }
 
 IN_PROC_BROWSER_TEST_F(VolumeControllerTest, Mutes) {
+  SetupSwitch();
   ASSERT_FALSE(audio_mixer()->IsMuted());
   double initial_volume = audio_mixer()->GetVolumePercent();
 
   VolumeMute();
   EXPECT_TRUE(audio_mixer()->IsMuted());
 
   // Further mute buttons doesn't have effects.
   VolumeMute();
   EXPECT_TRUE(audio_mixer()->IsMuted());
 
   // Right after the volume up after set_mute recovers to original volume.
   VolumeUp();
   EXPECT_FALSE(audio_mixer()->IsMuted());
   EXPECT_DOUBLE_EQ(initial_volume, audio_mixer()->GetVolumePercent());
 
   VolumeMute();
   // After the volume down, the volume goes down to zero explicitly.
   VolumeDown();
   EXPECT_TRUE(audio_mixer()->IsMuted());
   EXPECT_DOUBLE_EQ(0.0, audio_mixer()->GetVolumePercent());
 
   // Thus, further VolumeUp doesn't recover the volume, it's just slightly
   // bigger than 0.
   VolumeUp();
   EXPECT_LT(0.0, audio_mixer()->GetVolumePercent());
   EXPECT_GT(initial_volume, audio_mixer()->GetVolumePercent());
 }
 
 }  // namespace