Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(811)

Unified Diff: media/cast/net/pacing/paced_sender_unittest.cc

Issue 388663003: Cast: Reshuffle files under media/cast (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: missing includes Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/cast/net/pacing/paced_sender.cc ('k') | media/cast/net/rtcp/mock_rtcp_receiver_feedback.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/net/pacing/paced_sender_unittest.cc
diff --git a/media/cast/transport/pacing/paced_sender_unittest.cc b/media/cast/net/pacing/paced_sender_unittest.cc
similarity index 98%
rename from media/cast/transport/pacing/paced_sender_unittest.cc
rename to media/cast/net/pacing/paced_sender_unittest.cc
index 5e24fca4b5694f23b6c321fad8a91615f5e6b776..a2cd5fc16dd34c15e032b61a67a3d5676fc51d99 100644
--- a/media/cast/transport/pacing/paced_sender_unittest.cc
+++ b/media/cast/net/pacing/paced_sender_unittest.cc
@@ -6,16 +6,17 @@
#include "base/big_endian.h"
#include "base/test/simple_test_tick_clock.h"
+#include "media/cast/logging/logging_impl.h"
#include "media/cast/logging/simple_event_subscriber.h"
+#include "media/cast/net/pacing/paced_sender.h"
#include "media/cast/test/fake_single_thread_task_runner.h"
-#include "media/cast/transport/pacing/paced_sender.h"
#include "testing/gmock/include/gmock/gmock.h"
+using testing::_;
+
namespace media {
namespace cast {
-namespace transport {
-
-using testing::_;
+namespace {
static const uint8 kValue = 123;
static const size_t kSize1 = 100;
@@ -68,7 +69,7 @@ class PacedSenderTest : public ::testing::Test {
logging_.RemoveRawEventSubscriber(&subscriber_);
}
- static void UpdateCastTransportStatus(transport::CastTransportStatus status) {
+ static void UpdateCastTransportStatus(CastTransportStatus status) {
NOTREACHED();
}
@@ -124,6 +125,8 @@ class PacedSenderTest : public ::testing::Test {
DISALLOW_COPY_AND_ASSIGN(PacedSenderTest);
};
+} // namespace
+
TEST_F(PacedSenderTest, PassThroughRtcp) {
mock_transport_.AddExpectedSize(kSize1, 2);
SendPacketVector packets = CreateSendPacketVector(kSize1, 1, true);
@@ -346,6 +349,5 @@ TEST_F(PacedSenderTest, PaceWith60fps) {
EXPECT_TRUE(RunUntilEmpty(5));
}
-} // namespace transport
} // namespace cast
} // namespace media
« no previous file with comments | « media/cast/net/pacing/paced_sender.cc ('k') | media/cast/net/rtcp/mock_rtcp_receiver_feedback.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698