commit 140a31452403734dc5863d2d016cd234eb2d1f4d
author jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Mon Sep 09 18:54:37 2013
committer jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Mon Sep 09 18:54:37 2013
tree d7f2e279e54a8a12c2c8cde59c65e462b892ce4c
parent ea37c98a7798893cdee1aa4a89672a053aca59d6

Set up hdmi output device default volume to 100.

BUG=268438
TEST=hdmi output device should have maximum volume(100) be default.

Review URL: https://chromiumcodereview.appspot.com/23536034

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222066 0039d316-1c4b-4281-b951-d872f2087c98

chromeos/audio/cras_audio_handler_unittest.cc

diff --git a/chromeos/audio/cras_audio_handler_unittest.cc b/chromeos/audio/cras_audio_handler_unittest.cc
index 48a1200..8d6468ca 100644
--- a/chromeos/audio/cras_audio_handler_unittest.cc
+++ b/chromeos/audio/cras_audio_handler_unittest.cc
@@ -1075,7 +1075,7 @@
   AudioDevice device;
   EXPECT_TRUE(cras_audio_handler_->GetActiveOutputDevice(&device));
   EXPECT_EQ(device.id, kInternalSpeaker.id);
-  EXPECT_EQ(kVolume, audio_pref_handler_->GetVolumeGainValue(device));
+  EXPECT_EQ(kVolume, audio_pref_handler_->GetOutputVolumeValue(&device));
 }
 
 TEST_F(CrasAudioHandlerTest, SetInputGainPercent) {
@@ -1093,7 +1093,7 @@
   EXPECT_EQ(kGain, cras_audio_handler_->GetInputGainPercent());
   EXPECT_EQ(1, test_observer_->input_gain_changed_count());
   AudioDevice internal_mic(kInternalMic);
-  EXPECT_EQ(kGain, audio_pref_handler_->GetVolumeGainValue(internal_mic));
+  EXPECT_EQ(kGain, audio_pref_handler_->GetInputGainValue(&internal_mic));
 }
 
 TEST_F(CrasAudioHandlerTest, SetMuteForDevice) {
@@ -1161,7 +1161,7 @@
                 kHeadphone.id));
   AudioDevice headphone(kHeadphone);
   EXPECT_EQ(kHeadphoneVolume,
-            audio_pref_handler_->GetVolumeGainValue(headphone));
+            audio_pref_handler_->GetOutputVolumeValue(&headphone));
 
   // Set volume percent for non-active output device.
   const int kSpeakerVolume = 60;
@@ -1174,7 +1174,7 @@
                 kInternalSpeaker.id));
   AudioDevice speaker(kInternalSpeaker);
   EXPECT_EQ(kSpeakerVolume,
-            audio_pref_handler_->GetVolumeGainValue(speaker));
+            audio_pref_handler_->GetOutputVolumeValue(&speaker));
 
   // Set gain percent for active input device.
   const int kUSBMicGain = 30;
@@ -1187,7 +1187,7 @@
             cras_audio_handler_->GetOutputVolumePercentForDevice(kUSBMic.id));
   AudioDevice usb_mic(kHeadphone);
   EXPECT_EQ(kUSBMicGain,
-            audio_pref_handler_->GetVolumeGainValue(usb_mic));
+            audio_pref_handler_->GetInputGainValue(&usb_mic));
 
   // Set gain percent for non-active input device.
   const int kInternalMicGain = 60;
@@ -1200,7 +1200,7 @@
                 kInternalMic.id));
   AudioDevice internal_mic(kInternalMic);
   EXPECT_EQ(kInternalMicGain,
-            audio_pref_handler_->GetVolumeGainValue(internal_mic));
+            audio_pref_handler_->GetInputGainValue(&internal_mic));
 }
 
 TEST_F(CrasAudioHandlerTest, HandleOtherDeviceType) {