Cast: move net->transport

media/cast/test/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.
 
 // Test application that simulates a cast sender - Data can be either generated
 // or read from a file.
 
 #include "base/at_exit.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.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_sender.h"
 #include "media/cast/logging/logging_defines.h"
-#include "media/cast/net/transport/transport.h"
 #include "media/cast/test/audio_utility.h"
 #include "media/cast/test/utility/input_helper.h"
 #include "media/cast/test/video_utility.h"
+#include "media/cast/transport/transport/transport.h"
 #include "ui/gfx/size.h"
 
 namespace media {
 namespace cast {
 // Settings chosen to match default receiver settings.
 #define DEFAULT_SEND_PORT "2344"
 #define DEFAULT_RECEIVE_PORT "2346"
 #define DEFAULT_SEND_IP "127.0.0.1"
 #define DEFAULT_READ_FROM_FILE "0"
 #define DEFAULT_AUDIO_SENDER_SSRC "1"
@@ skipping 283 matching lines @@
       NULL,
       video_thread.message_loop_proxy(),
       NULL,
       media::cast::GetDefaultCastLoggingConfig()));
 
   media::cast::AudioSenderConfig audio_config =
       media::cast::GetAudioSenderConfig();
   media::cast::VideoSenderConfig video_config =
       media::cast::GetVideoSenderConfig();
 
-  scoped_ptr<media::cast::Transport> transport(
-      new media::cast::Transport(io_message_loop.message_loop_proxy()));
+  scoped_ptr<media::cast::transport::Transport> transport(
+      new media::cast::transport::Transport(
+      io_message_loop.message_loop_proxy()));
   scoped_ptr<media::cast::CastSender> cast_sender(
       media::cast::CastSender::CreateCastSender(cast_environment,
       audio_config,
       video_config,
       NULL,  // VideoEncoderController.
       transport->packet_sender()));
 
   media::cast::PacketReceiver* packet_receiver = cast_sender->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);
-  // TODO(mikhal): Add option to simulate packet loss.
 
   media::cast::FrameInput* frame_input = cast_sender->frame_input();
   scoped_ptr<media::cast::SendProcess> send_process(new
       media::cast::SendProcess(test_thread.message_loop_proxy(),
                                cast_environment->Clock(),
                                video_config,
                                frame_input));
 
   send_process->SendFrame();
   io_message_loop.Run();
   transport->StopReceiving();
   return 0;
 }