X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fmedia%2Fcast%2Faudio_sender%2Faudio_sender_unittest.cc;h=dc2c3bf8ec6b61d0a7f0240deffb64af989fcc59;hb=ff3e2503a20db9193d323c1d19c38c68004dec4a;hp=1d85771707d6a39a7cb306dd0836aab18dddd763;hpb=7338fba38ba696536d1cc9d389afd716a6ab2fe6;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/media/cast/audio_sender/audio_sender_unittest.cc b/src/media/cast/audio_sender/audio_sender_unittest.cc
index 1d85771..dc2c3bf 100644
--- a/src/media/cast/audio_sender/audio_sender_unittest.cc
+++ b/src/media/cast/audio_sender/audio_sender_unittest.cc
@@ -11,8 +11,8 @@
 #include "media/cast/cast_config.h"
 #include "media/cast/cast_environment.h"
 #include "media/cast/rtcp/rtcp.h"
-#include "media/cast/test/audio_utility.h"
-#include "media/cast/test/fake_task_runner.h"
+#include "media/cast/test/fake_single_thread_task_runner.h"
+#include "media/cast/test/utility/audio_utility.h"
 #include "media/cast/transport/cast_transport_config.h"
 #include "media/cast/transport/cast_transport_sender_impl.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ -28,9 +28,7 @@ using testing::Exactly;
 
 class TestPacketSender : public transport::PacketSender {
  public:
-  TestPacketSender()
-      : number_of_rtp_packets_(0),
-        number_of_rtcp_packets_(0) {}
+  TestPacketSender() : number_of_rtp_packets_(0), number_of_rtcp_packets_(0) {}
 
   virtual bool SendPacket(const Packet& packet) OVERRIDE {
     if (Rtcp::IsRtcpPacket(&packet[0], packet.size())) {
@@ -41,13 +39,9 @@ class TestPacketSender : public transport::PacketSender {
     return true;
   }
 
-  int number_of_rtp_packets() const {
-    return number_of_rtp_packets_;
-  }
+  int number_of_rtp_packets() const { return number_of_rtp_packets_; }
 
-  int number_of_rtcp_packets() const {
-    return number_of_rtcp_packets_;
-  }
+  int number_of_rtcp_packets() const { return number_of_rtcp_packets_; }
 
  private:
   int number_of_rtp_packets_;
@@ -66,26 +60,32 @@ class AudioSenderTest : public ::testing::Test {
     testing_clock_ = new base::SimpleTestTickClock();
     testing_clock_->Advance(
         base::TimeDelta::FromMilliseconds(kStartMillisecond));
-    task_runner_ = new test::FakeTaskRunner(testing_clock_);
-    cast_environment_ = new CastEnvironment(
-        scoped_ptr<base::TickClock>(testing_clock_).Pass(),
-        task_runner_, task_runner_, task_runner_, task_runner_,
-        task_runner_, task_runner_, GetDefaultCastSenderLoggingConfig());
+    task_runner_ = new test::FakeSingleThreadTaskRunner(testing_clock_);
+    cast_environment_ =
+        new CastEnvironment(scoped_ptr<base::TickClock>(testing_clock_).Pass(),
+                            task_runner_,
+                            task_runner_,
+                            task_runner_,
+                            task_runner_,
+                            task_runner_,
+                            task_runner_,
+                            GetDefaultCastSenderLoggingConfig());
     audio_config_.codec = transport::kOpus;
     audio_config_.use_external_encoder = false;
     audio_config_.frequency = kDefaultAudioSamplingRate;
     audio_config_.channels = 2;
     audio_config_.bitrate = kDefaultAudioEncoderBitrate;
-    audio_config_.rtp_payload_type = 127;
+    audio_config_.rtp_config.payload_type = 127;
 
     transport::CastTransportConfig transport_config;
-    transport_config.audio_rtp_payload_type = 127;
+    transport_config.audio_rtp_config.payload_type = 127;
     transport_config.audio_channels = 2;
     transport_sender_.reset(new transport::CastTransportSenderImpl(
         testing_clock_,
         transport_config,
-        base::Bind(&UpdateCastTransportStatus), task_runner_));
-    transport_sender_->InsertFakeTransportForTesting(&transport_);
+        base::Bind(&UpdateCastTransportStatus),
+        task_runner_,
+        &transport_));
     audio_sender_.reset(new AudioSender(
         cast_environment_, audio_config_, transport_sender_.get()));
     task_runner_->RunTasks();
@@ -100,7 +100,7 @@ class AudioSenderTest : public ::testing::Test {
   base::SimpleTestTickClock* testing_clock_;  // Owned by CastEnvironment.
   TestPacketSender transport_;
   scoped_ptr<transport::CastTransportSenderImpl> transport_sender_;
-  scoped_refptr<test::FakeTaskRunner> task_runner_;
+  scoped_refptr<test::FakeSingleThreadTaskRunner> task_runner_;
   scoped_ptr<AudioSender> audio_sender_;
   scoped_refptr<CastEnvironment> cast_environment_;
   AudioSenderConfig audio_config_;
@@ -110,36 +110,38 @@ TEST_F(AudioSenderTest, Encode20ms) {
   EXPECT_CALL(*this, InsertAudioCallback()).Times(Exactly(1));
 
   const base::TimeDelta kDuration = base::TimeDelta::FromMilliseconds(20);
-  scoped_ptr<AudioBus> bus(TestAudioBusFactory(
-      audio_config_.channels, audio_config_.frequency,
-      TestAudioBusFactory::kMiddleANoteFreq, 0.5f).NextAudioBus(kDuration));
+  scoped_ptr<AudioBus> bus(
+      TestAudioBusFactory(audio_config_.channels,
+                          audio_config_.frequency,
+                          TestAudioBusFactory::kMiddleANoteFreq,
+                          0.5f).NextAudioBus(kDuration));
 
   base::TimeTicks recorded_time = base::TimeTicks::Now();
-  audio_sender_->InsertAudio(
-      bus.get(),
-      recorded_time,
-      base::Bind(
-          &AudioSenderTest::InsertAudioCallback,
-          base::Unretained(this)));
+  audio_sender_->InsertAudio(bus.get(),
+                             recorded_time,
+                             base::Bind(&AudioSenderTest::InsertAudioCallback,
+                                        base::Unretained(this)));
   task_runner_->RunTasks();
-  EXPECT_GE(transport_.number_of_rtp_packets() +
-            transport_.number_of_rtcp_packets(), 1);
+  EXPECT_GE(
+      transport_.number_of_rtp_packets() + transport_.number_of_rtcp_packets(),
+      1);
 }
 
 TEST_F(AudioSenderTest, RtcpTimer) {
   EXPECT_CALL(*this, InsertAudioCallback()).Times(Exactly(1));
 
   const base::TimeDelta kDuration = base::TimeDelta::FromMilliseconds(20);
-  scoped_ptr<AudioBus> bus(TestAudioBusFactory(
-      audio_config_.channels, audio_config_.frequency,
-      TestAudioBusFactory::kMiddleANoteFreq, 0.5f).NextAudioBus(kDuration));
+  scoped_ptr<AudioBus> bus(
+      TestAudioBusFactory(audio_config_.channels,
+                          audio_config_.frequency,
+                          TestAudioBusFactory::kMiddleANoteFreq,
+                          0.5f).NextAudioBus(kDuration));
 
   base::TimeTicks recorded_time = base::TimeTicks::Now();
-  audio_sender_->InsertAudio(
-      bus.get(), recorded_time,
-      base::Bind(
-          &AudioSenderTest::InsertAudioCallback,
-          base::Unretained(this)));
+  audio_sender_->InsertAudio(bus.get(),
+                             recorded_time,
+                             base::Bind(&AudioSenderTest::InsertAudioCallback,
+                                        base::Unretained(this)));
   task_runner_->RunTasks();
 
   // Make sure that we send at least one RTCP packet.