Refactor RtpSender and SSRCDatabase a bit.

webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc

Index: webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc
index 2bf0254111091370a66efac51fdb940b42586840..e603073102bcd1dddd0aa540cdd9a5e49c83ff31 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc
@@ -135,19 +135,10 @@ class RtpSenderTest : public ::testing::Test {
     rtp_sender_.reset(new RTPSender(false, &fake_clock_, &transport_, nullptr,
                                     pacer ? &mock_paced_sender_ : nullptr,
                                     nullptr, nullptr, nullptr, nullptr, nullptr,
-                                    &mock_rtc_event_log_));
+                                    &mock_rtc_event_log_, &ssrc_database_));
     rtp_sender_->SetSequenceNumber(kSeqNum);
   }
 
-  SimulatedClock fake_clock_;
-  MockRtcEventLog mock_rtc_event_log_;
-  MockRtpPacketSender mock_paced_sender_;
-  rtc::scoped_ptr<RTPSender> rtp_sender_;
-  int payload_;
-  LoopbackTransportTest transport_;
-  const bool kMarkerBit;
-  uint8_t packet_[kMaxPacketLength];
-
   void VerifyRTPHeaderCommon(const RTPHeader& rtp_header) {
     VerifyRTPHeaderCommon(rtp_header, kMarkerBit, 0);
   }
@@ -179,6 +170,16 @@ class RtpSenderTest : public ::testing::Test {
                      packet_, payload_length, rtp_length, capture_time_ms,
                      kAllowRetransmission, RtpPacketSender::kNormalPriority));
   }
+
+  SSRCDatabase ssrc_database_;
+  SimulatedClock fake_clock_;
+  MockRtcEventLog mock_rtc_event_log_;
+  MockRtpPacketSender mock_paced_sender_;
+  rtc::scoped_ptr<RTPSender> rtp_sender_;
+  int payload_;
+  LoopbackTransportTest transport_;
+  const bool kMarkerBit;
+  uint8_t packet_[kMaxPacketLength];
 };
 
 // TODO(pbos): Move tests over from WithoutPacer to RtpSenderTest as this is our
@@ -904,9 +905,10 @@ TEST_F(RtpSenderTest, SendPadding) {
 
 TEST_F(RtpSenderTest, SendRedundantPayloads) {
   MockTransport transport;
-  rtp_sender_.reset(new RTPSender(
-      false, &fake_clock_, &transport, nullptr, &mock_paced_sender_, nullptr,
-      nullptr, nullptr, nullptr, nullptr, &mock_rtc_event_log_));
+  rtp_sender_.reset(new RTPSender(false, &fake_clock_, &transport, nullptr,
+                                  &mock_paced_sender_, nullptr, nullptr,
+                                  nullptr, nullptr, nullptr,
+                                  &mock_rtc_event_log_, &ssrc_database_));
   rtp_sender_->SetSequenceNumber(kSeqNum);
   rtp_sender_->SetRtxPayloadType(kRtxPayload, kPayload);
 
@@ -1047,9 +1049,9 @@ TEST_F(RtpSenderTest, FrameCountCallbacks) {
     FrameCounts frame_counts_;
   } callback;
 
-  rtp_sender_.reset(new RTPSender(false, &fake_clock_, &transport_, nullptr,
-                                  &mock_paced_sender_, nullptr, nullptr,
-                                  nullptr, &callback, nullptr, nullptr));
+  rtp_sender_.reset(new RTPSender(
+      false, &fake_clock_, &transport_, nullptr, &mock_paced_sender_, nullptr,
+      nullptr, nullptr, &callback, nullptr, nullptr, &ssrc_database_));
 
   char payload_name[RTP_PAYLOAD_NAME_SIZE] = "GENERIC";
   const uint8_t payload_type = 127;
@@ -1105,7 +1107,7 @@ TEST_F(RtpSenderTest, BitrateCallbacks) {
   } callback;
   rtp_sender_.reset(new RTPSender(false, &fake_clock_, &transport_, nullptr,
                                   nullptr, nullptr, nullptr, &callback, nullptr,
-                                  nullptr, nullptr));
+                                  nullptr, nullptr, &ssrc_database_));
 
   // Simulate kNumPackets sent with kPacketInterval ms intervals.
   const uint32_t kNumPackets = 15;
@@ -1158,7 +1160,7 @@ class RtpSenderAudioTest : public RtpSenderTest {
     payload_ = kAudioPayload;
     rtp_sender_.reset(new RTPSender(true, &fake_clock_, &transport_, nullptr,
                                     nullptr, nullptr, nullptr, nullptr, nullptr,
-                                    nullptr, nullptr));
+                                    nullptr, nullptr, &ssrc_database_));
     rtp_sender_->SetSequenceNumber(kSeqNum);
   }
 };