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 "base/memory/scoped_ptr.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 {
@@ skipping 60 matching lines @@
 
   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 {
+    volume_controller_.reset(new VolumeController());
+
     // 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();
     audio_mixer_ = NULL;

[James Cook, 2013/04/30 23:31:21]

Perhaps not necessary, but I would do volume_controller_.reset() here.

[rkc, 2013/04/30 23:36:37]

It's a scoped_ptr, the next .reset will cleanup the previous one. I made it a
scoped_ptr precisely so I wouldn't need to clean it up :)

   }
 
+  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+    command_line->AppendSwitch(ash::switches::kAshDisableNewAudioHandler);

[James Cook, 2013/04/30 23:31:21]

Maybe a todo and a bug to track fixing this test?

[rkc, 2013/04/30 23:36:37]

Added the TODO. Once we remove the old Audio Handler code, this code will be
directly affected - I don't believe it will be possible to check in that code
without fixing this test, hence skipping the creating a bug for it for the
moment.

+  }
+
  protected:
   void SetVolumePercent(double percent) {
-    volume_controller_.SetVolumePercent(percent);
+    volume_controller_->SetVolumePercent(percent);
   }
 
   void VolumeMute() {
-    volume_controller_.HandleVolumeMute(ui::Accelerator());
+    volume_controller_->HandleVolumeMute(ui::Accelerator());
   }
 
   void VolumeUnmute() {
-    volume_controller_.SetAudioMuted(false);
+    volume_controller_->SetAudioMuted(false);
   }
 
   void VolumeUp() {
-    volume_controller_.HandleVolumeUp(ui::Accelerator());
+    volume_controller_->HandleVolumeUp(ui::Accelerator());
   }
 
   void VolumeDown() {
-    volume_controller_.HandleVolumeDown(ui::Accelerator());
+    volume_controller_->HandleVolumeDown(ui::Accelerator());
   }
 
   MockAudioMixer* audio_mixer() { return audio_mixer_; }
 
  private:
-  VolumeController volume_controller_;
+  scoped_ptr<VolumeController> volume_controller_;
   MockAudioMixer* audio_mixer_;
 
   DISALLOW_COPY_AND_ASSIGN(VolumeControllerTest);
 };
 
 IN_PROC_BROWSER_TEST_F(VolumeControllerTest, VolumeUpAndDown) {
   // Set initial value as 50%
   audio_mixer()->SetVolumePercent(50.0);
 
   double initial_volume = audio_mixer()->GetVolumePercent();
@@ skipping 72 matching lines @@
   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