Remove GetOutputScaling from VoiceMediaChannel.

talk/media/webrtc/webrtcvoiceengine_unittest.cc

 /*
  * libjingle
  * Copyright 2008 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 3144 matching lines @@
   stream.ssrcs.push_back(kSsrc2);
   EXPECT_TRUE(channel_->AddRecvStream(stream));
   cricket::WebRtcVoiceMediaChannel* media_channel =
       static_cast<cricket::WebRtcVoiceMediaChannel*>(channel_);
   EXPECT_LT(media_channel->voe_channel(),
             media_channel->GetReceiveChannelNum(kSsrc2));
 }
 
 TEST_F(WebRtcVoiceEngineTestFake, SetOutputScaling) {
   EXPECT_TRUE(SetupEngine());
-  double left, right;
+  float scale, left, right;
   EXPECT_TRUE(channel_->SetOutputScaling(0, 1, 2));
-  EXPECT_TRUE(channel_->GetOutputScaling(0, &left, &right));
-  EXPECT_DOUBLE_EQ(1, left);
-  EXPECT_DOUBLE_EQ(2, right);
+  int channel_id = voe_.GetLastChannel();
+  EXPECT_EQ(0, voe_.GetChannelOutputVolumeScaling(channel_id, scale));
+  EXPECT_EQ(0, voe_.GetOutputVolumePan(channel_id, left, right));
+  EXPECT_DOUBLE_EQ(1, left * scale);
+  EXPECT_DOUBLE_EQ(2, right * scale);
 
   EXPECT_FALSE(channel_->SetOutputScaling(kSsrc2, 1, 2));
   cricket::StreamParams stream;
   stream.ssrcs.push_back(kSsrc2);
   EXPECT_TRUE(channel_->AddRecvStream(stream));
 
   EXPECT_TRUE(channel_->SetOutputScaling(kSsrc2, 2, 1));
-  EXPECT_TRUE(channel_->GetOutputScaling(kSsrc2, &left, &right));
-  EXPECT_DOUBLE_EQ(2, left);
-  EXPECT_DOUBLE_EQ(1, right);
+  channel_id = voe_.GetLastChannel();
+  EXPECT_EQ(0, voe_.GetChannelOutputVolumeScaling(channel_id, scale));
+  EXPECT_EQ(0, voe_.GetOutputVolumePan(channel_id, left, right));
+  EXPECT_DOUBLE_EQ(2, left * scale);
+  EXPECT_DOUBLE_EQ(1, right * scale);
 }
 
 TEST_F(WebRtcVoiceEngineTestFake, SetsSyncGroupFromSyncLabel) {
   cricket::FakeCall call((webrtc::Call::Config()));
   const uint32 kAudioSsrc = 123;
   const std::string kSyncLabel = "AvSyncLabel";
 
   EXPECT_TRUE(SetupEngine());
   cricket::WebRtcVoiceMediaChannel* media_channel =
       static_cast<cricket::WebRtcVoiceMediaChannel*>(channel_);
@@ skipping 434 matching lines @@
   engine.Terminate();
 }
 
 // Test that we set our preferred codecs properly.
 TEST(WebRtcVoiceEngineTest, SetRecvCodecs) {
   cricket::WebRtcVoiceEngine engine;
   EXPECT_TRUE(engine.Init(rtc::Thread::Current()));
   cricket::WebRtcVoiceMediaChannel channel(&engine);
   EXPECT_TRUE(channel.SetRecvCodecs(engine.codecs()));
 }