1 files changed, 32 insertions, 22 deletions

diff --git a/media/cast/rtcp/rtcp_unittest.cc b/media/cast/rtcp/rtcp_unittest.cc
index 221ecf1..8287d99 100644
--- a/media/cast/rtcp/rtcp_unittest.cc
+++ b/media/cast/rtcp/rtcp_unittest.cc
@@ -4,11 +4,13 @@
 
 #include "base/test/simple_test_tick_clock.h"
 #include "media/cast/cast_defines.h"
+#include "media/cast/cast_environment.h"
 #include "media/cast/pacing/paced_sender.h"
 #include "media/cast/rtcp/mock_rtcp_receiver_feedback.h"
 #include "media/cast/rtcp/mock_rtcp_sender_feedback.h"
 #include "media/cast/rtcp/rtcp.h"
 #include "media/cast/rtcp/test_rtcp_packet_builder.h"
+#include "media/cast/test/fake_task_runner.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace media {
@@ -26,7 +28,8 @@ static const int64 kAddedShortDelay= 100;
 
 class LocalRtcpTransport : public PacedPacketSender {
  public:
-  explicit LocalRtcpTransport(base::SimpleTestTickClock* testing_clock)
+  explicit LocalRtcpTransport(scoped_refptr<CastEnvironment> cast_environment,
+                              base::SimpleTestTickClock* testing_clock)
       : drop_packets_(false),
         short_delay_(false),
         testing_clock_(testing_clock) {}
@@ -64,11 +67,12 @@ class LocalRtcpTransport : public PacedPacketSender {
   bool short_delay_;
   Rtcp* rtcp_;
   base::SimpleTestTickClock* testing_clock_;
+  scoped_refptr<CastEnvironment> cast_environment_;
 };
 
 class RtcpPeer : public Rtcp {
  public:
-  RtcpPeer(base::TickClock* clock,
+  RtcpPeer(scoped_refptr<CastEnvironment> cast_environment,
            RtcpSenderFeedback* sender_feedback,
            PacedPacketSender* const paced_packet_sender,
            RtpSenderStatistics* rtp_sender_statistics,
@@ -78,7 +82,7 @@ class RtcpPeer : public Rtcp {
            uint32 local_ssrc,
            uint32 remote_ssrc,
            const std::string& c_name)
-      : Rtcp(clock,
+      : Rtcp(cast_environment,
              sender_feedback,
              paced_packet_sender,
              rtp_sender_statistics,
@@ -97,7 +101,11 @@ class RtcpPeer : public Rtcp {
 class RtcpTest : public ::testing::Test {
  protected:
   RtcpTest()
-      : transport_(&testing_clock_) {
+      : task_runner_(new test::FakeTaskRunner(&testing_clock_)),
+        cast_environment_(new CastEnvironment(&testing_clock_, task_runner_,
+            task_runner_, task_runner_, task_runner_, task_runner_,
+            GetDefaultCastLoggingConfig())),
+        transport_(cast_environment_, &testing_clock_) {
     testing_clock_.Advance(
         base::TimeDelta::FromMilliseconds(kStartMillisecond));
   }
@@ -109,6 +117,8 @@ class RtcpTest : public ::testing::Test {
   }
 
   base::SimpleTestTickClock testing_clock_;
+  scoped_refptr<test::FakeTaskRunner> task_runner_;
+  scoped_refptr<CastEnvironment> cast_environment_;
   LocalRtcpTransport transport_;
   MockRtcpSenderFeedback mock_sender_feedback_;
 };
@@ -116,7 +126,7 @@ class RtcpTest : public ::testing::Test {
 TEST_F(RtcpTest, TimeToSend) {
   base::TimeTicks start_time;
   start_time += base::TimeDelta::FromMilliseconds(kStartMillisecond);
-  Rtcp rtcp(&testing_clock_,
+  Rtcp rtcp(cast_environment_,
             &mock_sender_feedback_,
             &transport_,
             NULL,
@@ -137,7 +147,7 @@ TEST_F(RtcpTest, TimeToSend) {
 }
 
 TEST_F(RtcpTest, BasicSenderReport) {
-  Rtcp rtcp(&testing_clock_,
+  Rtcp rtcp(cast_environment_,
             &mock_sender_feedback_,
             &transport_,
             NULL,
@@ -152,7 +162,7 @@ TEST_F(RtcpTest, BasicSenderReport) {
 }
 
 TEST_F(RtcpTest, BasicReceiverReport) {
-  Rtcp rtcp(&testing_clock_,
+  Rtcp rtcp(cast_environment_,
             &mock_sender_feedback_,
             &transport_,
             NULL,
@@ -170,7 +180,7 @@ TEST_F(RtcpTest, BasicCast) {
   EXPECT_CALL(mock_sender_feedback_, OnReceivedCastFeedback(_)).Times(1);
 
   // Media receiver.
-  Rtcp rtcp(&testing_clock_,
+  Rtcp rtcp(cast_environment_,
             &mock_sender_feedback_,
             &transport_,
             NULL,
@@ -197,8 +207,8 @@ TEST_F(RtcpTest, BasicCast) {
 
 TEST_F(RtcpTest, RttReducedSizeRtcp) {
   // Media receiver.
-  LocalRtcpTransport receiver_transport(&testing_clock_);
-  Rtcp rtcp_receiver(&testing_clock_,
+  LocalRtcpTransport receiver_transport(cast_environment_, &testing_clock_);
+  Rtcp rtcp_receiver(cast_environment_,
                      &mock_sender_feedback_,
                      &receiver_transport,
                      NULL,
@@ -210,8 +220,8 @@ TEST_F(RtcpTest, RttReducedSizeRtcp) {
                      kCName);
 
   // Media sender.
-  LocalRtcpTransport sender_transport(&testing_clock_);
-  Rtcp rtcp_sender(&testing_clock_,
+  LocalRtcpTransport sender_transport(cast_environment_, &testing_clock_);
+  Rtcp rtcp_sender(cast_environment_,
                    &mock_sender_feedback_,
                    &sender_transport,
                    NULL,
@@ -251,8 +261,8 @@ TEST_F(RtcpTest, RttReducedSizeRtcp) {
 
 TEST_F(RtcpTest, Rtt) {
   // Media receiver.
-  LocalRtcpTransport receiver_transport(&testing_clock_);
-  Rtcp rtcp_receiver(&testing_clock_,
+  LocalRtcpTransport receiver_transport(cast_environment_, &testing_clock_);
+  Rtcp rtcp_receiver(cast_environment_,
                      &mock_sender_feedback_,
                      &receiver_transport,
                      NULL,
@@ -264,8 +274,8 @@ TEST_F(RtcpTest, Rtt) {
                      kCName);
 
   // Media sender.
-  LocalRtcpTransport sender_transport(&testing_clock_);
-  Rtcp rtcp_sender(&testing_clock_,
+  LocalRtcpTransport sender_transport(cast_environment_, &testing_clock_);
+  Rtcp rtcp_sender(cast_environment_,
                    &mock_sender_feedback_,
                    &sender_transport,
                    NULL,
@@ -337,8 +347,8 @@ TEST_F(RtcpTest, Rtt) {
 
 TEST_F(RtcpTest, RttWithPacketLoss) {
   // Media receiver.
-  LocalRtcpTransport receiver_transport(&testing_clock_);
-  Rtcp rtcp_receiver(&testing_clock_,
+  LocalRtcpTransport receiver_transport(cast_environment_, &testing_clock_);
+  Rtcp rtcp_receiver(cast_environment_,
                      &mock_sender_feedback_,
                      &receiver_transport,
                      NULL,
@@ -350,8 +360,8 @@ TEST_F(RtcpTest, RttWithPacketLoss) {
                      kCName);
 
   // Media sender.
-  LocalRtcpTransport sender_transport(&testing_clock_);
-  Rtcp rtcp_sender(&testing_clock_,
+  LocalRtcpTransport sender_transport(cast_environment_, &testing_clock_);
+  Rtcp rtcp_sender(cast_environment_,
                    &mock_sender_feedback_,
                    &sender_transport,
                    NULL,
@@ -437,7 +447,7 @@ TEST_F(RtcpTest, NtpAndTime) {
 }
 
 TEST_F(RtcpTest, WrapAround) {
-  RtcpPeer rtcp_peer(&testing_clock_,
+  RtcpPeer rtcp_peer(cast_environment_,
                      &mock_sender_feedback_,
                      NULL,
                      NULL,
@@ -465,7 +475,7 @@ TEST_F(RtcpTest, WrapAround) {
 }
 
 TEST_F(RtcpTest, RtpTimestampInSenderTime) {
-  RtcpPeer rtcp_peer(&testing_clock_,
+  RtcpPeer rtcp_peer(cast_environment_,
                      &mock_sender_feedback_,
                      NULL,
                      NULL,