Cast: move net->transport

media/cast/audio_sender/audio_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/audio_sender/audio_sender.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "crypto/encryptor.h"
 #include "crypto/symmetric_key.h"
 #include "media/cast/audio_sender/audio_encoder.h"
 #include "media/cast/cast_environment.h"
-#include "media/cast/net/rtp_sender/rtp_sender.h"
 #include "media/cast/rtcp/rtcp.h"
+#include "media/cast/transport/rtp_sender/rtp_sender.h"
 
 namespace media {
 namespace cast {
 
 const int64 kMinSchedulingDelayMs = 1;
 
 class LocalRtcpAudioSenderFeedback : public RtcpSenderFeedback {
  public:
   explicit LocalRtcpAudioSenderFeedback(AudioSender* audio_sender)
       : audio_sender_(audio_sender) {
   }
 
   virtual void OnReceivedCastFeedback(
       const RtcpCastMessage& cast_feedback) OVERRIDE {
     if (!cast_feedback.missing_frames_and_packets_.empty()) {
       audio_sender_->ResendPackets(cast_feedback.missing_frames_and_packets_);
     }
     VLOG(1) << "Received audio ACK "
             << static_cast<int>(cast_feedback.ack_frame_id_);
   }
 
  private:
   AudioSender* audio_sender_;
 };
 
 class LocalRtpSenderStatistics : public RtpSenderStatistics {
  public:
-  explicit LocalRtpSenderStatistics(RtpSender* rtp_sender)
+  explicit LocalRtpSenderStatistics(transport::RtpSender* rtp_sender)
      : rtp_sender_(rtp_sender) {
   }
 
   virtual void GetStatistics(const base::TimeTicks& now,
                              RtcpSenderInfo* sender_info) OVERRIDE {
     rtp_sender_->RtpStatistics(now, sender_info);
   }
 
  private:
-  RtpSender* rtp_sender_;
+  transport::RtpSender* rtp_sender_;
 };
 
-AudioSender::AudioSender(scoped_refptr<CastEnvironment> cast_environment,
-                         const AudioSenderConfig& audio_config,
-                         PacedPacketSender* const paced_packet_sender)
+AudioSender::AudioSender(
+    scoped_refptr<CastEnvironment> cast_environment,
+    const AudioSenderConfig& audio_config,
+    transport::PacedPacketSender* const paced_packet_sender)
       : cast_environment_(cast_environment),
         rtp_sender_(cast_environment, &audio_config, NULL,
                     paced_packet_sender),
         rtcp_feedback_(new LocalRtcpAudioSenderFeedback(this)),
         rtp_audio_sender_statistics_(
             new LocalRtpSenderStatistics(&rtp_sender_)),
         rtcp_(cast_environment,
               rtcp_feedback_.get(),
               paced_packet_sender,
               rtp_audio_sender_statistics_.get(),
@@ skipping 134 matching lines @@
 void AudioSender::SendRtcpReport() {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
   // We don't send audio logging messages since all captured audio frames will
   // be sent.
   rtcp_.SendRtcpFromRtpSender(NULL);
   ScheduleNextRtcpReport();
 }
 
 }  // namespace cast
 }  // namespace media