Cast: Reshuffle files under media/cast

chrome/renderer/media/cast_transport_sender_ipc.cc

Index: chrome/renderer/media/cast_transport_sender_ipc.cc
diff --git a/chrome/renderer/media/cast_transport_sender_ipc.cc b/chrome/renderer/media/cast_transport_sender_ipc.cc
index ddee387aaa55bd9132066abf0c2d61adeaa970c1..da5a26e57800fd8472b9954111b0786e211af644 100644
--- a/chrome/renderer/media/cast_transport_sender_ipc.cc
+++ b/chrome/renderer/media/cast_transport_sender_ipc.cc
@@ -10,12 +10,11 @@
 #include "chrome/renderer/media/cast_ipc_dispatcher.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "media/cast/cast_sender.h"
-#include "media/cast/transport/cast_transport_sender.h"
 
 CastTransportSenderIPC::CastTransportSenderIPC(
     const net::IPEndPoint& remote_end_point,
-    const media::cast::transport::CastTransportStatusCallback& status_cb,
-    const media::cast::transport::BulkRawEventsCallback& raw_events_cb)
+    const media::cast::CastTransportStatusCallback& status_cb,
+    const media::cast::BulkRawEventsCallback& raw_events_cb)
     : status_callback_(status_cb), raw_events_callback_(raw_events_cb) {
   if (CastIPCDispatcher::Get()) {
     channel_id_ = CastIPCDispatcher::Get()->AddSender(this);
@@ -31,27 +30,27 @@ CastTransportSenderIPC::~CastTransportSenderIPC() {
 }
 
 void CastTransportSenderIPC::SetPacketReceiver(
-    const media::cast::transport::PacketReceiverCallback& packet_callback) {
+    const media::cast::PacketReceiverCallback& packet_callback) {
   packet_callback_ = packet_callback;
 }
 
 void CastTransportSenderIPC::InitializeAudio(
-    const media::cast::transport::CastTransportRtpConfig& config) {
+    const media::cast::CastTransportRtpConfig& config) {
   Send(new CastHostMsg_InitializeAudio(channel_id_, config));
 }
 
 void CastTransportSenderIPC::InitializeVideo(
-    const media::cast::transport::CastTransportRtpConfig& config) {
+    const media::cast::CastTransportRtpConfig& config) {
   Send(new CastHostMsg_InitializeVideo(channel_id_, config));
 }
 
 void CastTransportSenderIPC::InsertCodedAudioFrame(
-    const media::cast::transport::EncodedFrame& audio_frame) {
+    const media::cast::EncodedFrame& audio_frame) {
   Send(new CastHostMsg_InsertCodedAudioFrame(channel_id_, audio_frame));
 }
 
 void CastTransportSenderIPC::InsertCodedVideoFrame(
-    const media::cast::transport::EncodedFrame& video_frame) {
+    const media::cast::EncodedFrame& video_frame) {
   Send(new CastHostMsg_InsertCodedVideoFrame(channel_id_, video_frame));
 }
 
@@ -60,10 +59,10 @@ void CastTransportSenderIPC::SendRtcpFromRtpSender(
     uint32 ntp_seconds,
     uint32 ntp_fraction,
     uint32 rtp_timestamp,
-    const media::cast::transport::RtcpDlrrReportBlock& dlrr,
+    const media::cast::RtcpDlrrReportBlock& dlrr,
     uint32 sending_ssrc,
     const std::string& c_name) {
-  struct media::cast::transport::SendRtcpFromRtpSenderData data;
+  struct media::cast::SendRtcpFromRtpSenderData data;
   data.packet_type_flags = packet_type_flags;
   data.sending_ssrc = sending_ssrc;
   data.c_name = c_name;
@@ -92,8 +91,8 @@ void CastTransportSenderIPC::OnReceivedPacket(
     const media::cast::Packet& packet) {
   if (!packet_callback_.is_null()) {
     // TODO(hubbe): Perhaps an non-ownership-transferring cb here?
-    scoped_ptr<media::cast::transport::Packet> packet_copy(
-        new media::cast::transport::Packet(packet));
+    scoped_ptr<media::cast::Packet> packet_copy(
+        new media::cast::Packet(packet));
     packet_callback_.Run(packet_copy.Pass());
   } else {
     DVLOG(1) << "CastIPCDispatcher::OnReceivedPacket no packet callback yet.";
@@ -101,7 +100,7 @@ void CastTransportSenderIPC::OnReceivedPacket(
 }
 
 void CastTransportSenderIPC::OnNotifyStatusChange(
-    media::cast::transport::CastTransportStatus status) {
+    media::cast::CastTransportStatus status) {
   status_callback_.Run(status);
 }