Cast: move net->transport

media/cast/video_sender/video_sender_unittest.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 <vector>
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "media/base/video_frame.h"
 #include "media/cast/cast_environment.h"
-#include "media/cast/net/pacing/mock_paced_packet_sender.h"
-#include "media/cast/net/pacing/paced_sender.h"
 #include "media/cast/test/fake_task_runner.h"
 #include "media/cast/test/video_utility.h"
+#include "media/cast/transport/pacing/mock_paced_packet_sender.h"
+#include "media/cast/transport/pacing/paced_sender.h"
 #include "media/cast/video_sender/mock_video_encoder_controller.h"
 #include "media/cast/video_sender/video_sender.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 namespace cast {
 
 namespace {
 static const int64 kStartMillisecond = GG_INT64_C(12345678900000);
 static const uint8 kPixelValue = 123;
 static const int kWidth = 320;
 static const int kHeight = 240;
 }
 
 using testing::_;
 using testing::AtLeast;
 
 namespace {
 class PeerVideoSender : public VideoSender {
  public:
   PeerVideoSender(scoped_refptr<CastEnvironment> cast_environment,
                   const VideoSenderConfig& video_config,
                   VideoEncoderController* const video_encoder_controller,
-                  PacedPacketSender* const paced_packet_sender)
+                  transport::PacedPacketSender* const paced_packet_sender)
       : VideoSender(cast_environment, video_config,
                     video_encoder_controller, paced_packet_sender) {
   }
   using VideoSender::OnReceivedCastFeedback;
 };
 }  // namespace
 
 class VideoSenderTest : public ::testing::Test {
  protected:
   VideoSenderTest() {
@@ skipping 40 matching lines @@
     gfx::Size size(kWidth, kHeight);
     scoped_refptr<media::VideoFrame> video_frame =
         media::VideoFrame::CreateFrame(VideoFrame::I420, size, gfx::Rect(size),
                                        size, base::TimeDelta());
     PopulateVideoFrame(video_frame, kPixelValue);
     return video_frame;
   }
 
   MockVideoEncoderController mock_video_encoder_controller_;
   base::SimpleTestTickClock testing_clock_;
-  MockPacedPacketSender mock_transport_;
+  transport::MockPacedPacketSender mock_transport_;
   scoped_refptr<test::FakeTaskRunner> task_runner_;
   scoped_ptr<PeerVideoSender> video_sender_;
   scoped_refptr<CastEnvironment> cast_environment_;
 };
 
 TEST_F(VideoSenderTest, BuiltInEncoder) {
   EXPECT_CALL(mock_transport_, SendPackets(_)).Times(1);
 
   InitEncoder(false);
   scoped_refptr<media::VideoFrame> video_frame = GetNewVideoFrame();
@@ skipping 77 matching lines @@
       base::TimeDelta::FromMilliseconds(1 + kDefaultRtpMaxDelayMs);
 
   // Make sure that we do a re-send.
   testing_clock_.Advance(max_resend_timeout);
   task_runner_->RunTasks();
 }
 
 }  // namespace cast
 }  // namespace media