Merge from Chromium at DEPS revision 228962

This commit was generated by merge_to_master.py.

Change-Id: I23bd7d7766f213fd52f28ae5e1ecc6ae9df905ea

1 files changed, 3 insertions, 14 deletions

diff --git a/media/cast/video_sender/video_sender.h b/media/cast/video_sender/video_sender.h
index 9098e975c4..6e86645445 100644
--- a/media/cast/video_sender/video_sender.h
+++ b/media/cast/video_sender/video_sender.h
@@ -10,11 +10,10 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
-#include "base/time/default_tick_clock.h"
 #include "base/time/tick_clock.h"
 #include "base/time/time.h"
 #include "media/cast/cast_config.h"
-#include "media/cast/cast_thread.h"
+#include "media/cast/cast_environment.h"
 #include "media/cast/congestion_control/congestion_control.h"
 #include "media/cast/rtcp/rtcp.h"
 #include "media/cast/rtp_sender/rtp_sender.h"
@@ -37,7 +36,7 @@ class PacedPacketSender;
 class VideoSender : public base::NonThreadSafe,
                     public base::SupportsWeakPtr<VideoSender> {
  public:
-  VideoSender(scoped_refptr<CastThread> cast_thread,
+  VideoSender(scoped_refptr<CastEnvironment> cast_environment,
               const VideoSenderConfig& video_config,
               VideoEncoderController* const video_encoder_controller,
               PacedPacketSender* const paced_packet_sender);
@@ -65,13 +64,6 @@ class VideoSender : public base::NonThreadSafe,
   void IncomingRtcpPacket(const uint8* packet, int length,
                           const base::Closure callback);
 
-  void set_clock(base::TickClock* clock) {
-    clock_ = clock;
-    congestion_control_.set_clock(clock);
-    rtcp_->set_clock(clock);
-    rtp_sender_->set_clock(clock);
-  }
-
  protected:
   // Protected for testability.
   void OnReceivedCastFeedback(const RtcpCastMessage& cast_feedback);
@@ -113,7 +105,7 @@ class VideoSender : public base::NonThreadSafe,
   const base::TimeDelta rtp_max_delay_;
   const int max_frame_rate_;
 
-  scoped_refptr<CastThread> cast_thread_;
+  scoped_refptr<CastEnvironment> cast_environment_;
   scoped_ptr<LocalRtcpVideoSenderFeedback> rtcp_feedback_;
   scoped_ptr<LocalRtpVideoSenderStatistics> rtp_video_sender_statistics_;
   scoped_refptr<VideoEncoder> video_encoder_;
@@ -130,9 +122,6 @@ class VideoSender : public base::NonThreadSafe,
   int last_skip_count_;
   CongestionControl congestion_control_;
 
-  base::DefaultTickClock default_tick_clock_;
-  base::TickClock* clock_;
-
   base::WeakPtrFactory<VideoSender> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoSender);