Remove UpdateSsrcs from EncoderStateFeedback.

webrtc/video_engine/encoder_state_feedback_unittest.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 50 matching lines @@
   }
   rtc::scoped_ptr<MockProcessThread> process_thread_;
   rtc::scoped_ptr<EncoderStateFeedback> encoder_state_feedback_;
   PacketRouter router_;
   PacedSender pacer_;
 };
 
 TEST_F(VieKeyRequestTest, CreateAndTriggerRequests) {
   const int ssrc = 1234;
   MockVieEncoder encoder(process_thread_.get(), &pacer_);
-  EXPECT_TRUE(encoder_state_feedback_->AddEncoder(ssrc, &encoder));
+  encoder_state_feedback_->AddEncoder(std::vector<uint32_t>(1, ssrc), &encoder);
 
   EXPECT_CALL(encoder, OnReceivedIntraFrameRequest(ssrc))
       .Times(1);
   encoder_state_feedback_->GetRtcpIntraFrameObserver()->
       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);
 
   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_->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_);
-  EXPECT_TRUE(encoder_state_feedback_->AddEncoder(ssrc_1, &encoder_1));
-  EXPECT_TRUE(encoder_state_feedback_->AddEncoder(ssrc_2, &encoder_2));
+  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);
 
@@ skipping 20 matching lines @@
       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);
 }
 
-TEST_F(VieKeyRequestTest, AddTwiceError) {
-  const int ssrc = 1234;
-  MockVieEncoder encoder(process_thread_.get(), &pacer_);
-  EXPECT_TRUE(encoder_state_feedback_->AddEncoder(ssrc, &encoder));
-  EXPECT_FALSE(encoder_state_feedback_->AddEncoder(ssrc, &encoder));
-  encoder_state_feedback_->RemoveEncoder(&encoder);
-}
-
 }  // namespace webrtc