Cast:Adding cast_transport_config and cleaning up

media/cast/video_sender/video_sender.cc

Index: media/cast/video_sender/video_sender.cc
diff --git a/media/cast/video_sender/video_sender.cc b/media/cast/video_sender/video_sender.cc
index d94d3b7037d1b8190dee01e6382a7f732211b03b..9ed5101d3454fd39d771c15869a206965580aacb 100644
--- a/media/cast/video_sender/video_sender.cc
+++ b/media/cast/video_sender/video_sender.cc
@@ -60,7 +60,7 @@ VideoSender::VideoSender(
       max_frame_rate_(video_config.max_frame_rate),
       cast_environment_(cast_environment),
       rtcp_feedback_(new LocalRtcpVideoSenderFeedback(this)),
-      rtp_sender_(new transport::RtpSender(cast_environment,
+      rtp_sender_(new transport::RtpSender(cast_environment->Clock(),
                                            NULL,
                                            &video_config,
                                            paced_packet_sender)),
@@ -147,9 +147,10 @@ void VideoSender::InsertRawVideoFrame(
   }
 }
 
-void VideoSender::InsertCodedVideoFrame(const EncodedVideoFrame* encoded_frame,
-                                        const base::TimeTicks& capture_time,
-                                        const base::Closure callback) {
+void VideoSender::InsertCodedVideoFrame(
+    const transport::EncodedVideoFrame* encoded_frame,
+    const base::TimeTicks& capture_time,
+    const base::Closure callback) {
   DCHECK(!video_encoder_.get()) << "Invalid state";
   DCHECK(encoded_frame) << "Invalid argument";
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
@@ -159,13 +160,14 @@ void VideoSender::InsertCodedVideoFrame(const EncodedVideoFrame* encoded_frame,
 }
 
 void VideoSender::SendEncodedVideoFrameMainThread(
-    scoped_ptr<EncodedVideoFrame> video_frame,
+    scoped_ptr<transport::EncodedVideoFrame> video_frame,
     const base::TimeTicks& capture_time) {
   SendEncodedVideoFrame(video_frame.get(), capture_time);
 }
 
-bool VideoSender::EncryptVideoFrame(const EncodedVideoFrame& video_frame,
-                                    EncodedVideoFrame* encrypted_frame) {
+bool VideoSender::EncryptVideoFrame(
+    const transport::EncodedVideoFrame& video_frame,
+    transport::EncodedVideoFrame* encrypted_frame) {
   DCHECK(encryptor_) << "Invalid state";
 
   if (!encryptor_->SetCounter(GetAesNonce(video_frame.frame_id, iv_mask_))) {
@@ -185,13 +187,14 @@ bool VideoSender::EncryptVideoFrame(const EncodedVideoFrame& video_frame,
   return true;
 }
 
-void VideoSender::SendEncodedVideoFrame(const EncodedVideoFrame* encoded_frame,
-                                        const base::TimeTicks& capture_time) {
+void VideoSender::SendEncodedVideoFrame(
+    const transport::EncodedVideoFrame* encoded_frame,
+    const base::TimeTicks& capture_time) {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
   last_send_time_ = cast_environment_->Clock()->NowTicks();
 
   if (encryptor_) {
-    EncodedVideoFrame encrypted_video_frame;
+    transport::EncodedVideoFrame encrypted_video_frame;
 
     if (!EncryptVideoFrame(*encoded_frame, &encrypted_video_frame)) {
       // Logging already done.