Reland: Remove AudioTrackRenderer

talk/app/webrtc/webrtcsession_unittest.cc

Index: talk/app/webrtc/webrtcsession_unittest.cc
diff --git a/talk/app/webrtc/webrtcsession_unittest.cc b/talk/app/webrtc/webrtcsession_unittest.cc
index ab8c14cb26bb8423e4d9c9ae07e2b6854eb5009c..e8624761e9e699bfbb3c15faca6eaa6676ace626 100644
--- a/talk/app/webrtc/webrtcsession_unittest.cc
+++ b/talk/app/webrtc/webrtcsession_unittest.cc
@@ -330,26 +330,16 @@ class WebRtcSessionCreateSDPObserverForTest
 
 class FakeAudioRenderer : public cricket::AudioRenderer {
  public:
-  FakeAudioRenderer() : channel_id_(-1), sink_(NULL) {}
+  FakeAudioRenderer() : sink_(NULL) {}
   virtual ~FakeAudioRenderer() {
     if (sink_)
       sink_->OnClose();
   }
 
-  void AddChannel(int channel_id) override {
-    ASSERT(channel_id_ == -1);
-    channel_id_ = channel_id;
-  }
-  void RemoveChannel(int channel_id) override {
-    ASSERT(channel_id == channel_id_);
-    channel_id_ = -1;
-  }
   void SetSink(Sink* sink) override { sink_ = sink; }
 
-  int channel_id() const { return channel_id_; }
   cricket::AudioRenderer::Sink* sink() const { return sink_; }
  private:
-  int channel_id_;
   cricket::AudioRenderer::Sink* sink_;
 };
 
@@ -3115,11 +3105,9 @@ TEST_F(WebRtcSessionTest, SetAudioPlayout) {
   session_->SetAudioPlayout(receive_ssrc, false, renderer.get());
   EXPECT_TRUE(channel->GetOutputVolume(receive_ssrc, &volume));
   EXPECT_EQ(0, volume);
-  EXPECT_EQ(0, renderer->channel_id());
   session_->SetAudioPlayout(receive_ssrc, true, NULL);
   EXPECT_TRUE(channel->GetOutputVolume(receive_ssrc, &volume));
   EXPECT_EQ(1, volume);
-  EXPECT_EQ(-1, renderer->channel_id());
 }
 
 TEST_F(WebRtcSessionTest, SetAudioSend) {
@@ -3139,7 +3127,6 @@ TEST_F(WebRtcSessionTest, SetAudioSend) {
   session_->SetAudioSend(send_ssrc, false, options, renderer.get());
   EXPECT_TRUE(channel->IsStreamMuted(send_ssrc));
   EXPECT_FALSE(channel->options().echo_cancellation.IsSet());
-  EXPECT_EQ(0, renderer->channel_id());
   EXPECT_TRUE(renderer->sink() != NULL);
 
   // This will trigger SetSink(NULL) to the |renderer|.
@@ -3148,7 +3135,6 @@ TEST_F(WebRtcSessionTest, SetAudioSend) {
   bool value;
   EXPECT_TRUE(channel->options().echo_cancellation.Get(&value));
   EXPECT_TRUE(value);
-  EXPECT_EQ(-1, renderer->channel_id());
   EXPECT_TRUE(renderer->sink() == NULL);
 }