Cast: Reshuffle files under media/cast

media/cast/receiver/frame_receiver_unittest.cc

 // Copyright 2014 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 <deque>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "media/cast/cast_defines.h"
 #include "media/cast/cast_environment.h"
 #include "media/cast/logging/simple_event_subscriber.h"
+#include "media/cast/net/pacing/mock_paced_packet_sender.h"
+#include "media/cast/net/rtcp/test_rtcp_packet_builder.h"
 #include "media/cast/receiver/frame_receiver.h"
-#include "media/cast/rtcp/test_rtcp_packet_builder.h"
 #include "media/cast/test/fake_single_thread_task_runner.h"
 #include "media/cast/test/utility/default_config.h"
-#include "media/cast/transport/pacing/mock_paced_packet_sender.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using ::testing::_;
 
 namespace media {
 namespace cast {
 
 namespace {
 
 const int kPacketSize = 1500;
 const uint32 kFirstFrameId = 1234;
 const int kPlayoutDelayMillis = 100;
 
 class FakeFrameClient {
  public:
   FakeFrameClient() : num_called_(0) {}
   virtual ~FakeFrameClient() {}
 
   void AddExpectedResult(uint32 expected_frame_id,
                          const base::TimeTicks& expected_playout_time) {
     expected_results_.push_back(
         std::make_pair(expected_frame_id, expected_playout_time));
   }
 
-  void DeliverEncodedFrame(scoped_ptr<transport::EncodedFrame> frame) {
+  void DeliverEncodedFrame(scoped_ptr<EncodedFrame> frame) {
     SCOPED_TRACE(::testing::Message() << "num_called_ is " << num_called_);
     ASSERT_FALSE(!frame)
         << "If at shutdown: There were unsatisfied requests enqueued.";
     ASSERT_FALSE(expected_results_.empty());
     EXPECT_EQ(expected_results_.front().first, frame->frame_id);
     EXPECT_EQ(expected_results_.front().second, frame->reference_time);
     expected_results_.pop_front();
     ++num_called_;
   }
 
@@ skipping 74 matching lines @@
                              ntp_seconds, ntp_fraction,
                              static_cast<uint32>(rtp_timestamp));
     ASSERT_TRUE(receiver_->ProcessPacket(rtcp_packet.GetPacket().Pass()));
   }
 
   FrameReceiverConfig config_;
   std::vector<uint8> payload_;
   RtpCastHeader rtp_header_;
   base::SimpleTestTickClock* testing_clock_;  // Owned by CastEnvironment.
   base::TimeTicks start_time_;
-  transport::MockPacedPacketSender mock_transport_;
+  MockPacedPacketSender mock_transport_;
   scoped_refptr<test::FakeSingleThreadTaskRunner> task_runner_;
   scoped_refptr<CastEnvironment> cast_environment_;
   FakeFrameClient frame_client_;
 
   // Important for the FrameReceiver to be declared last, since its dependencies
   // must remain alive until after its destruction.
   scoped_ptr<FrameReceiver> receiver_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameReceiverTest);
 };
@@ skipping 260 matching lines @@
     EXPECT_GE(kFirstFrameId + 3, frame_events[i].frame_id);
     const int frame_offset = frame_events[i].frame_id - kFirstFrameId;
     EXPECT_EQ(frame_offset * rtp_advance_per_frame,
               frame_events[i].rtp_timestamp);
   }
   cast_environment_->Logging()->RemoveRawEventSubscriber(&event_subscriber);
 }
 
 }  // namespace cast
 }  // namespace media