Cast: Clean up injection of transport into PacedPacketSender

media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "media/cast/test/fake_task_runner.h"
 #include "media/cast/transport/pacing/paced_sender.h"
@@ skipping 83 matching lines @@
  protected:
   RtpPacketizerTest()
       : task_runner_(new test::FakeTaskRunner(&testing_clock_)),
         video_frame_(),
         packet_storage_(&testing_clock_, kMaxPacketStorageTimeMs) {
     config_.sequence_number = kSeqNum;
     config_.ssrc = kSsrc;
     config_.payload_type = kPayload;
     config_.max_payload_length = kMaxPacketLength;
     transport_.reset(new TestRtpPacketTransport(config_));
-    pacer_.reset(new PacedSender(&testing_clock_, NULL, transport_.get(),
-                                 task_runner_,
-                                 base::Bind(UpdateCastTransportStatus)));
+    pacer_.reset(new PacedSender(&testing_clock_,
+                                 transport_.get(),
+                                 task_runner_));
     rtp_packetizer_.reset(new RtpPacketizer(pacer_.get(), &packet_storage_,
                                             config_));
     video_frame_.key_frame = false;
     video_frame_.frame_id = 0;
     video_frame_.last_referenced_frame_id = kStartFrameId;
     video_frame_.data.assign(kFrameSize, 123);
   }
 
   virtual ~RtpPacketizerTest() {}
 
   void RunTasks(int during_ms) {
     for (int i = 0; i < during_ms; ++i) {
       // Call process the timers every 1 ms.
       testing_clock_.Advance(base::TimeDelta::FromMilliseconds(1));
       task_runner_->RunTasks();
     }
   }
-  static void UpdateCastTransportStatus(CastTransportStatus status) {
-    EXPECT_EQ(status, TRANSPORT_INITIALIZED);
-  }
 
   base::SimpleTestTickClock testing_clock_;
   scoped_refptr<test::FakeTaskRunner> task_runner_;
   EncodedVideoFrame video_frame_;
   PacketStorage packet_storage_;
   RtpPacketizerConfig config_;
   scoped_ptr<TestRtpPacketTransport> transport_;
   scoped_ptr<PacedSender> pacer_;
   scoped_ptr<RtpPacketizer> rtp_packetizer_;
 
@@ skipping 23 matching lines @@
                                              testing_clock_.NowTicks());
   RunTasks(33 + 1);
   EXPECT_EQ(expected_num_of_packets, rtp_packetizer_->send_packets_count());
   EXPECT_EQ(kFrameSize, rtp_packetizer_->send_octet_count());
   EXPECT_EQ(expected_num_of_packets, transport_->number_of_packets_received());
 }
 
 }  // namespace transport
 }  // namespace cast
 }  // namespace media