Simplify EncoderStateFeedback.

webrtc/video/encoder_state_feedback_unittest.cc

Index: webrtc/video/encoder_state_feedback_unittest.cc
diff --git a/webrtc/video/encoder_state_feedback_unittest.cc b/webrtc/video/encoder_state_feedback_unittest.cc
index de4616f1760ed45bd3acea695b737e7c4be1937a..18bcec3aa93ab7b4dda362a45dac85c5cc1339cb 100644
--- a/webrtc/video/encoder_state_feedback_unittest.cc
+++ b/webrtc/video/encoder_state_feedback_unittest.cc
@@ -62,10 +62,9 @@ class VieKeyRequestTest : public ::testing::Test {
                0) {}
   virtual void SetUp() {
     process_thread_.reset(new NiceMock<MockProcessThread>);
-    encoder_state_feedback_.reset(new EncoderStateFeedback());
   }
   rtc::scoped_ptr<MockProcessThread> process_thread_;
-  rtc::scoped_ptr<EncoderStateFeedback> encoder_state_feedback_;
+  EncoderStateFeedback encoder_state_feedback_;
   PacketRouter router_;
   PacedSender pacer_;
 };
@@ -73,77 +72,23 @@ class VieKeyRequestTest : public ::testing::Test {
 TEST_F(VieKeyRequestTest, CreateAndTriggerRequests) {

[danilchap, 2016/02/17 16:14:00]

OnLocalSsrcChanged probably should be tested too.

[pbos-webrtc, 2016/02/18 16:00:29]

Added DCHECKs to verify in runtime that it's never called, so there's no
functionality to verify (and I don't think a death test for it is important).

   const int ssrc = 1234;

[danilchap, 2016/02/17 16:14:01]

const uint32_t ssrc

[pbos-webrtc, 2016/02/18 16:00:29]

Done

   MockVieEncoder encoder(process_thread_.get(), &pacer_);
-  encoder_state_feedback_->AddEncoder(std::vector<uint32_t>(1, ssrc), &encoder);
+  encoder_state_feedback_.Init(std::vector<uint32_t>(1, ssrc), &encoder);
 
   EXPECT_CALL(encoder, OnReceivedIntraFrameRequest(ssrc))
       .Times(1);
-  encoder_state_feedback_->GetRtcpIntraFrameObserver()->
-      OnReceivedIntraFrameRequest(ssrc);
+  encoder_state_feedback_.OnReceivedIntraFrameRequest(ssrc);
 
   const uint8_t sli_picture_id = 3;
   EXPECT_CALL(encoder, OnReceivedSLI(ssrc, sli_picture_id))
       .Times(1);
-  encoder_state_feedback_->GetRtcpIntraFrameObserver()->OnReceivedSLI(
-      ssrc, sli_picture_id);
+  encoder_state_feedback_.OnReceivedSLI(ssrc, sli_picture_id);
 
   const uint64_t rpsi_picture_id = 9;
   EXPECT_CALL(encoder, OnReceivedRPSI(ssrc, rpsi_picture_id))
       .Times(1);
-  encoder_state_feedback_->GetRtcpIntraFrameObserver()->OnReceivedRPSI(
-      ssrc, rpsi_picture_id);
+  encoder_state_feedback_.OnReceivedRPSI(ssrc, rpsi_picture_id);
 
-  encoder_state_feedback_->RemoveEncoder(&encoder);
-}
-
-// Register multiple encoders and make sure the request is relayed to correct
-// ViEEncoder.
-TEST_F(VieKeyRequestTest, MultipleEncoders) {
-  const int ssrc_1 = 1234;
-  const int ssrc_2 = 5678;
-  MockVieEncoder encoder_1(process_thread_.get(), &pacer_);
-  MockVieEncoder encoder_2(process_thread_.get(), &pacer_);
-  encoder_state_feedback_->AddEncoder(std::vector<uint32_t>(1, ssrc_1),
-                                      &encoder_1);
-  encoder_state_feedback_->AddEncoder(std::vector<uint32_t>(1, ssrc_2),
-                                      &encoder_2);
-
-  EXPECT_CALL(encoder_1, OnReceivedIntraFrameRequest(ssrc_1))
-      .Times(1);
-  EXPECT_CALL(encoder_2, OnReceivedIntraFrameRequest(ssrc_2))
-      .Times(1);
-  encoder_state_feedback_->GetRtcpIntraFrameObserver()->
-      OnReceivedIntraFrameRequest(ssrc_1);
-  encoder_state_feedback_->GetRtcpIntraFrameObserver()->
-      OnReceivedIntraFrameRequest(ssrc_2);
-
-  const uint8_t sli_pid_1 = 3;
-  const uint8_t sli_pid_2 = 4;
-  EXPECT_CALL(encoder_1, OnReceivedSLI(ssrc_1, sli_pid_1))
-      .Times(1);
-  EXPECT_CALL(encoder_2, OnReceivedSLI(ssrc_2, sli_pid_2))
-      .Times(1);
-  encoder_state_feedback_->GetRtcpIntraFrameObserver()->OnReceivedSLI(
-      ssrc_1, sli_pid_1);
-  encoder_state_feedback_->GetRtcpIntraFrameObserver()->OnReceivedSLI(
-      ssrc_2, sli_pid_2);
-
-  const uint64_t rpsi_pid_1 = 9;
-  const uint64_t rpsi_pid_2 = 10;
-  EXPECT_CALL(encoder_1, OnReceivedRPSI(ssrc_1, rpsi_pid_1))
-      .Times(1);
-  EXPECT_CALL(encoder_2, OnReceivedRPSI(ssrc_2, rpsi_pid_2))
-      .Times(1);
-  encoder_state_feedback_->GetRtcpIntraFrameObserver()->OnReceivedRPSI(
-      ssrc_1, rpsi_pid_1);
-  encoder_state_feedback_->GetRtcpIntraFrameObserver()->OnReceivedRPSI(
-      ssrc_2, rpsi_pid_2);
-
-  encoder_state_feedback_->RemoveEncoder(&encoder_1);
-  EXPECT_CALL(encoder_2, OnReceivedIntraFrameRequest(ssrc_2))
-      .Times(1);
-  encoder_state_feedback_->GetRtcpIntraFrameObserver()->
-      OnReceivedIntraFrameRequest(ssrc_2);
-  encoder_state_feedback_->RemoveEncoder(&encoder_2);
+  encoder_state_feedback_.TearDown();
 }
 
 }  // namespace webrtc