Use mojo volume interfaces for mash and classic ash.

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 <memory>
 #include <vector>
 
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/accessibility_types.h"
 #include "base/command_line.h"
@@ skipping 56 matching lines @@
  public:
   VolumeControllerTest() {}
   ~VolumeControllerTest() override {}
 
   void SetUpOnMainThread() override {
     volume_controller_.reset(new VolumeController());
     audio_handler_ = chromeos::CrasAudioHandler::Get();
   }
 
  protected:
-  void VolumeMute() {
-    volume_controller_->HandleVolumeMute(ui::Accelerator());
-  }
-
-  void VolumeUp() {
-    volume_controller_->HandleVolumeUp(ui::Accelerator());
-  }
-
-  void VolumeDown() {
-    volume_controller_->HandleVolumeDown(ui::Accelerator());
-  }
-
   chromeos::CrasAudioHandler* audio_handler_;  // Not owned.
+  std::unique_ptr<VolumeController> volume_controller_;
 
  private:
-  std::unique_ptr<VolumeController> volume_controller_;
-
   DISALLOW_COPY_AND_ASSIGN(VolumeControllerTest);
 };
 
 IN_PROC_BROWSER_TEST_F(VolumeControllerTest, VolumeUpAndDown) {
   // Set initial value as 50%
   const int kInitVolume = 50;
   audio_handler_->SetOutputVolumePercent(kInitVolume);
 
   EXPECT_EQ(audio_handler_->GetOutputVolumePercent(), kInitVolume);
 
-  VolumeUp();
+  volume_controller_->VolumeUp();
   EXPECT_LT(kInitVolume, audio_handler_->GetOutputVolumePercent());
-  VolumeDown();
+  volume_controller_->VolumeDown();
   EXPECT_EQ(kInitVolume, audio_handler_->GetOutputVolumePercent());
-  VolumeDown();
+  volume_controller_->VolumeDown();
   EXPECT_GT(kInitVolume, audio_handler_->GetOutputVolumePercent());
 }
 
 IN_PROC_BROWSER_TEST_F(VolumeControllerTest, VolumeDownToZero) {
   // Setting to very small volume.
   audio_handler_->SetOutputVolumePercent(1);
 
-  VolumeDown();
+  volume_controller_->VolumeDown();
   EXPECT_EQ(0, audio_handler_->GetOutputVolumePercent());
-  VolumeDown();
+  volume_controller_->VolumeDown();
   EXPECT_EQ(0, audio_handler_->GetOutputVolumePercent());
-  VolumeUp();
+  volume_controller_->VolumeUp();
   EXPECT_LT(0, audio_handler_->GetOutputVolumePercent());
 }
 
 IN_PROC_BROWSER_TEST_F(VolumeControllerTest, VolumeUpTo100) {
   // Setting to almost max
   audio_handler_->SetOutputVolumePercent(99);
 
-  VolumeUp();
+  volume_controller_->VolumeUp();
   EXPECT_EQ(100, audio_handler_->GetOutputVolumePercent());
-  VolumeUp();
+  volume_controller_->VolumeUp();
   EXPECT_EQ(100, audio_handler_->GetOutputVolumePercent());
-  VolumeDown();
+  volume_controller_->VolumeDown();
   EXPECT_GT(100, audio_handler_->GetOutputVolumePercent());
 }
 
 IN_PROC_BROWSER_TEST_F(VolumeControllerTest, Mutes) {
   ASSERT_FALSE(audio_handler_->IsOutputMuted());
   const int initial_volume = audio_handler_->GetOutputVolumePercent();
 
-  VolumeMute();
+  volume_controller_->VolumeMute();
   EXPECT_TRUE(audio_handler_->IsOutputMuted());
 
   // Further mute buttons doesn't have effects.
-  VolumeMute();
+  volume_controller_->VolumeMute();
   EXPECT_TRUE(audio_handler_->IsOutputMuted());
 
   // Right after the volume up after set_mute recovers to original volume.
-  VolumeUp();
+  volume_controller_->VolumeUp();
   EXPECT_FALSE(audio_handler_->IsOutputMuted());
   EXPECT_EQ(initial_volume, audio_handler_->GetOutputVolumePercent());
 
-  VolumeMute();
+  volume_controller_->VolumeMute();
   // After the volume down, the volume goes down to zero explicitly.
-  VolumeDown();
+  volume_controller_->VolumeDown();
   EXPECT_TRUE(audio_handler_->IsOutputMuted());
   EXPECT_EQ(0, audio_handler_->GetOutputVolumePercent());
 
   // Thus, further VolumeUp doesn't recover the volume, it's just slightly
   // bigger than 0.
-  VolumeUp();
+  volume_controller_->VolumeUp();
   EXPECT_LT(0, audio_handler_->GetOutputVolumePercent());
   EXPECT_GT(initial_volume, audio_handler_->GetOutputVolumePercent());
 }
 
 class VolumeControllerSoundsTest : public VolumeControllerTest {
  public:
   VolumeControllerSoundsTest() : sounds_manager_(NULL) {}
   ~VolumeControllerSoundsTest() override {}
 
   void SetUpInProcessBrowserTestFixture() override {
@@ skipping 18 matching lines @@
  private:
   SoundsManagerTestImpl* sounds_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(VolumeControllerSoundsTest);
 };
 
 IN_PROC_BROWSER_TEST_F(VolumeControllerSoundsTest, Simple) {
   audio_handler_->SetOutputVolumePercent(50);
 
   EnableSpokenFeedback(false /* enabled */);
-  VolumeUp();
-  VolumeDown();
+  volume_controller_->VolumeUp();
+  volume_controller_->VolumeDown();
   EXPECT_EQ(0, num_play_requests());
 
   EnableSpokenFeedback(true /* enabled */);
-  VolumeUp();
-  VolumeDown();
+  volume_controller_->VolumeUp();
+  volume_controller_->VolumeDown();
   EXPECT_EQ(2, num_play_requests());
 }
 
 IN_PROC_BROWSER_TEST_F(VolumeControllerSoundsTest, EdgeCases) {
   EXPECT_TRUE(is_sound_initialized());
   EnableSpokenFeedback(true /* enabled */);
 
   // Check that sound is played on volume up and volume down.
   audio_handler_->SetOutputVolumePercent(50);
-  VolumeUp();
+  volume_controller_->VolumeUp();
   EXPECT_EQ(1, num_play_requests());
-  VolumeDown();
+  volume_controller_->VolumeDown();
   EXPECT_EQ(2, num_play_requests());
 
   audio_handler_->SetOutputVolumePercent(99);
-  VolumeUp();
+  volume_controller_->VolumeUp();
   EXPECT_EQ(3, num_play_requests());
 
   audio_handler_->SetOutputVolumePercent(100);
-  VolumeUp();
+  volume_controller_->VolumeUp();
   EXPECT_EQ(3, num_play_requests());
 
   // Check that sound isn't played when audio is muted.
   audio_handler_->SetOutputVolumePercent(50);
-  VolumeMute();
-  VolumeDown();
+  volume_controller_->VolumeMute();
+  volume_controller_->VolumeDown();
   ASSERT_TRUE(audio_handler_->IsOutputMuted());
   EXPECT_EQ(3, num_play_requests());
 
   // Check that audio is unmuted and sound is played.
-  VolumeUp();
+  volume_controller_->VolumeUp();
   ASSERT_FALSE(audio_handler_->IsOutputMuted());
   EXPECT_EQ(4, num_play_requests());
 }
 
 class VolumeControllerSoundsDisabledTest : public VolumeControllerSoundsTest {
  public:
   VolumeControllerSoundsDisabledTest() {}
   ~VolumeControllerSoundsDisabledTest() override {}
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     VolumeControllerSoundsTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(chromeos::switches::kDisableVolumeAdjustSound);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(VolumeControllerSoundsDisabledTest);
 };
 
 IN_PROC_BROWSER_TEST_F(VolumeControllerSoundsDisabledTest,
                        VolumeAdjustSounds) {
   EXPECT_FALSE(is_sound_initialized());
 
   // Check that sound isn't played on volume up and volume down.
   audio_handler_->SetOutputVolumePercent(50);
-  VolumeUp();
-  VolumeDown();
+  volume_controller_->VolumeUp();
+  volume_controller_->VolumeDown();
   EXPECT_EQ(0, num_play_requests());
 }
 
 }  // namespace