Cast: move net->transport

media/cast/test/receiver.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 <algorithm>
 #include <climits>
 #include <cstdarg>
 #include <cstdio>
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/threading/thread.h"
 #include "base/time/default_tick_clock.h"
 #include "media/base/video_frame.h"
 #include "media/cast/cast_config.h"
 #include "media/cast/cast_environment.h"
 #include "media/cast/cast_receiver.h"
 #include "media/cast/logging/logging_defines.h"
-#include "media/cast/net/transport/transport.h"
 #include "media/cast/test/utility/input_helper.h"
+#include "media/cast/transport/transport/transport.h"
 
 #if defined(OS_LINUX)
 #include "media/cast/test/linux_output_window.h"
 #endif  // OS_LINUX
 
 namespace media {
 namespace cast {
 // Settings chosen to match default sender settings.
 #define DEFAULT_SEND_PORT "2346"
 #define DEFAULT_RECEIVE_PORT "2344"
@@ skipping 196 matching lines @@
                                    audio_thread.message_loop_proxy(),
                                    NULL,
                                    video_thread.message_loop_proxy(),
                                    media::cast::GetDefaultCastLoggingConfig()));
 
   media::cast::AudioReceiverConfig audio_config =
       media::cast::GetAudioReceiverConfig();
   media::cast::VideoReceiverConfig video_config =
       media::cast::GetVideoReceiverConfig();
 
-  scoped_ptr<media::cast::Transport> transport(
-      new media::cast::Transport(main_message_loop.message_loop_proxy()));
+  scoped_ptr<media::cast::transport::Transport> transport(
+      new media::cast::transport::Transport(
+      main_message_loop.message_loop_proxy()));
   scoped_ptr<media::cast::CastReceiver> cast_receiver(
       media::cast::CastReceiver::CreateCastReceiver(
       cast_environment,
       audio_config,
       video_config,
       transport->packet_sender()));
 
   media::cast::PacketReceiver* packet_receiver =
       cast_receiver->packet_receiver();
 
   int send_to_port, receive_port;
   media::cast::GetPorts(&send_to_port, &receive_port);
   std::string ip_address = media::cast::GetIpAddress("Enter destination IP.");
   std::string local_ip_address = media::cast::GetIpAddress("Enter local IP.");
   transport->SetLocalReceiver(packet_receiver, ip_address, local_ip_address,
                               receive_port);
   transport->SetSendDestination(ip_address, send_to_port);
 
   scoped_refptr<media::cast::ReceiveProcess> receive_process(
       new media::cast::ReceiveProcess(cast_receiver->frame_receiver()));
   receive_process->Start();
   main_message_loop.Run();
   transport->StopReceiving();
   return 0;
 }