Reland: Remove AudioTrackRenderer

talk/app/webrtc/webrtcsession_unittest.cc

 /*
  * libjingle
  * Copyright 2012 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 312 matching lines @@
  protected:
   ~WebRtcSessionCreateSDPObserverForTest() {}
 
  private:
   rtc::scoped_ptr<SessionDescriptionInterface> description_;
   State state_;
 };
 
 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_;
 };
 
 class WebRtcSessionTest
     : public testing::TestWithParam<RTCCertificateGenerationMethod> {
  protected:
   // TODO Investigate why ChannelManager crashes, if it's created
   // after stun_server.
   WebRtcSessionTest()
     : media_engine_(new cricket::FakeMediaEngine()),
@@ skipping 2745 matching lines @@
   ASSERT_TRUE(channel != NULL);
   ASSERT_EQ(1u, channel->recv_streams().size());
   uint32_t receive_ssrc = channel->recv_streams()[0].first_ssrc();
   double volume;
   EXPECT_TRUE(channel->GetOutputVolume(receive_ssrc, &volume));
   EXPECT_EQ(1, volume);
   rtc::scoped_ptr<FakeAudioRenderer> renderer(new FakeAudioRenderer());
   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) {
   Init();
   mediastream_signaling_.SendAudioVideoStream1();
   CreateAndSetRemoteOfferAndLocalAnswer();
   cricket::FakeVoiceMediaChannel* channel = media_engine_->GetVoiceChannel(0);
   ASSERT_TRUE(channel != NULL);
   ASSERT_EQ(1u, channel->send_streams().size());
   uint32_t send_ssrc = channel->send_streams()[0].first_ssrc();
   EXPECT_FALSE(channel->IsStreamMuted(send_ssrc));
 
   cricket::AudioOptions options;
   options.echo_cancellation.Set(true);
 
   rtc::scoped_ptr<FakeAudioRenderer> renderer(new FakeAudioRenderer());
   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|.
   session_->SetAudioSend(send_ssrc, true, options, NULL);
   EXPECT_FALSE(channel->IsStreamMuted(send_ssrc));
   bool value;
   EXPECT_TRUE(channel->options().echo_cancellation.Get(&value));
   EXPECT_TRUE(value);
-  EXPECT_EQ(-1, renderer->channel_id());
   EXPECT_TRUE(renderer->sink() == NULL);
 }
 
 TEST_F(WebRtcSessionTest, AudioRendererForLocalStream) {
   Init();
   mediastream_signaling_.SendAudioVideoStream1();
   CreateAndSetRemoteOfferAndLocalAnswer();
   cricket::FakeVoiceMediaChannel* channel = media_engine_->GetVoiceChannel(0);
   ASSERT_TRUE(channel != NULL);
   ASSERT_EQ(1u, channel->send_streams().size());
@@ skipping 868 matching lines @@
 }
 
 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled.  That test
 // currently fails because upon disconnection and reconnection OnIceComplete is
 // called more than once without returning to IceGatheringGathering.
 
 INSTANTIATE_TEST_CASE_P(WebRtcSessionTests,
                         WebRtcSessionTest,
                         testing::Values(ALREADY_GENERATED,
                                         DTLS_IDENTITY_STORE));