Revert 243647 "Cast:Adding cast_transport_config and cleaning up"

trunk/src/media/cast/transport/rtp_sender/rtp_sender.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_sender.h"
 
 #include "base/logging.h"
 #include "base/rand_util.h"
+#include "media/cast/rtcp/rtcp_defines.h"
 #include "media/cast/transport/cast_transport_defines.h"
 #include "media/cast/transport/pacing/paced_sender.h"
 #include "net/base/big_endian.h"
 
 namespace media {
 namespace cast {
 namespace transport {
 
-RtpSender::RtpSender(base::TickClock* clock,
+RtpSender::RtpSender(scoped_refptr<CastEnvironment> cast_environment,
                      const AudioSenderConfig* audio_config,
                      const VideoSenderConfig* video_config,
                      PacedPacketSender* transport)
-    : config_(),
+    : cast_environment_(cast_environment),
+      config_(),
       transport_(transport) {
   // Store generic cast config and create packetizer config.
   DCHECK(audio_config || video_config) << "Invalid argument";
   if (audio_config) {
-    storage_.reset(new PacketStorage(clock, audio_config->rtp_history_ms));
+    storage_.reset(new PacketStorage(cast_environment->Clock(),
+                                     audio_config->rtp_history_ms));
     config_.audio = true;
     config_.ssrc = audio_config->sender_ssrc;
     config_.payload_type = audio_config->rtp_payload_type;
     config_.frequency = audio_config->frequency;
     config_.audio_codec = audio_config->codec;
   } else {
-    storage_.reset(new PacketStorage(clock, video_config->rtp_history_ms));
+    storage_.reset(new PacketStorage(cast_environment->Clock(),
+                                     video_config->rtp_history_ms));
     config_.audio = false;
     config_.ssrc = video_config->sender_ssrc;
     config_.payload_type = video_config->rtp_payload_type;
     config_.frequency = kVideoFrequency;
     config_.video_codec = video_config->codec;
   }
   // Randomly set start values.
   config_.sequence_number = base::RandInt(0, 65535);
   config_.rtp_timestamp = base::RandInt(0, 65535);
   config_.rtp_timestamp += base::RandInt(0, 65535) << 16;
@@ skipping 90 matching lines @@
   } else {
     sender_info->rtp_timestamp = 0;
   }
   sender_info->send_packet_count = packetizer_->send_packets_count();
   sender_info->send_octet_count = packetizer_->send_octet_count();
 }
 
 }  // namespace transport
 }  //  namespace cast
 }  // namespace media