Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / media / cast / transport / pacing / paced_sender_unittest.cc

diff --git a/src/media/cast/transport/pacing/paced_sender_unittest.cc b/src/media/cast/transport/pacing/paced_sender_unittest.cc
index aa56f9e..b1d20ac 100644 (file)
--- a/src/media/cast/transport/pacing/paced_sender_unittest.cc
+++ b/src/media/cast/transport/pacing/paced_sender_unittest.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/test/simple_test_tick_clock.h"
-#include "media/cast/test/fake_task_runner.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"
 
@@ -23,6 +23,8 @@ static const int64 kStartMillisecond = GG_INT64_C(12345678900000);
 
 class TestPacketSender : public PacketSender {
  public:
+  TestPacketSender() {}
+
   virtual bool SendPacket(const Packet& packet) OVERRIDE {
     EXPECT_FALSE(expected_packet_size_.empty());
     size_t expected_packet_size = expected_packet_size_.front();
@@ -39,6 +41,8 @@ class TestPacketSender : public PacketSender {
 
  private:
   std::list<int> expected_packet_size_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestPacketSender);
 };
 
 class PacedSenderTest : public ::testing::Test {
@@ -46,13 +50,9 @@ class PacedSenderTest : public ::testing::Test {
   PacedSenderTest() {
     testing_clock_.Advance(
         base::TimeDelta::FromMilliseconds(kStartMillisecond));
-    task_runner_ = new test::FakeTaskRunner(&testing_clock_);
-    paced_sender_.reset(new PacedSender(
-        &testing_clock_,
-        NULL,
-        &mock_transport_,
-        task_runner_,
-        base::Bind(&UpdateCastTransportStatus)));
+    task_runner_ = new test::FakeSingleThreadTaskRunner(&testing_clock_);
+    paced_sender_.reset(
+        new PacedSender(&testing_clock_, &mock_transport_, task_runner_));
   }
 
   virtual ~PacedSenderTest() {}
@@ -71,8 +71,10 @@ class PacedSenderTest : public ::testing::Test {
 
   base::SimpleTestTickClock testing_clock_;
   TestPacketSender mock_transport_;
-  scoped_refptr<test::FakeTaskRunner> task_runner_;
+  scoped_refptr<test::FakeSingleThreadTaskRunner> task_runner_;
   scoped_ptr<PacedSender> paced_sender_;
+
+  DISALLOW_COPY_AND_ASSIGN(PacedSenderTest);
 };
 
 TEST_F(PacedSenderTest, PassThroughRtcp) {
@@ -127,8 +129,7 @@ TEST_F(PacedSenderTest, PaceWithNack) {
   PacketList second_frame_packets =
       CreatePacketList(kSize2, num_of_packets_in_frame);
 
-  PacketList nack_packets =
-      CreatePacketList(kNackSize, num_of_packets_in_nack);
+  PacketList nack_packets = CreatePacketList(kNackSize, num_of_packets_in_nack);
 
   // Check that the first burst of the frame go out on the wire.
   mock_transport_.AddExpectedSize(kSize1, 3);