| Index: media/cast/net/rtcp/rtcp_receiver_unittest.cc
|
| diff --git a/media/cast/rtcp/rtcp_receiver_unittest.cc b/media/cast/net/rtcp/rtcp_receiver_unittest.cc
|
| similarity index 97%
|
| rename from media/cast/rtcp/rtcp_receiver_unittest.cc
|
| rename to media/cast/net/rtcp/rtcp_receiver_unittest.cc
|
| index 485c3ee765eb3312191f344b5e69d6604f2c4c3b..efdb2b44bb0bfb94b88185e0e5418117c38887c8 100644
|
| --- a/media/cast/rtcp/rtcp_receiver_unittest.cc
|
| +++ b/media/cast/net/rtcp/rtcp_receiver_unittest.cc
|
| @@ -5,13 +5,13 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/test/simple_test_tick_clock.h"
|
| #include "media/cast/cast_environment.h"
|
| -#include "media/cast/rtcp/mock_rtcp_receiver_feedback.h"
|
| -#include "media/cast/rtcp/mock_rtcp_sender_feedback.h"
|
| -#include "media/cast/rtcp/rtcp_receiver.h"
|
| -#include "media/cast/rtcp/rtcp_utility.h"
|
| -#include "media/cast/rtcp/test_rtcp_packet_builder.h"
|
| +#include "media/cast/net/cast_transport_defines.h"
|
| +#include "media/cast/net/rtcp/mock_rtcp_receiver_feedback.h"
|
| +#include "media/cast/net/rtcp/mock_rtcp_sender_feedback.h"
|
| +#include "media/cast/net/rtcp/rtcp_receiver.h"
|
| +#include "media/cast/net/rtcp/rtcp_utility.h"
|
| +#include "media/cast/net/rtcp/test_rtcp_packet_builder.h"
|
| #include "media/cast/test/fake_single_thread_task_runner.h"
|
| -#include "media/cast/transport/cast_transport_defines.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
|
|
| namespace media {
|
| @@ -73,7 +73,7 @@ class RtcpReceiverCastLogVerification : public RtcpReceiverFeedback {
|
| called_on_received_receiver_log_(false) {}
|
|
|
| virtual void OnReceivedSenderReport(
|
| - const transport::RtcpSenderInfo& remote_sender_info) OVERRIDE{};
|
| + const RtcpSenderInfo& remote_sender_info) OVERRIDE{};
|
|
|
| virtual void OnReceiverReferenceTimeReport(
|
| const RtcpReceiverReferenceTimeReport& remote_time_report) OVERRIDE{};
|
| @@ -189,8 +189,8 @@ class RtcpReceiverTest : public ::testing::Test {
|
| MockRtcpRttFeedback mock_rtt_feedback_;
|
| MockRtcpSenderFeedback mock_sender_feedback_;
|
| scoped_ptr<RtcpReceiver> rtcp_receiver_;
|
| - transport::RtcpSenderInfo expected_sender_info_;
|
| - transport::RtcpReportBlock expected_report_block_;
|
| + RtcpSenderInfo expected_sender_info_;
|
| + RtcpReportBlock expected_report_block_;
|
| RtcpReceiverReferenceTimeReport expected_receiver_reference_report_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(RtcpReceiverTest);
|
|
|