Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / remoting / client / audio_player_unittest.cc

diff --git a/src/remoting/client/audio_player_unittest.cc b/src/remoting/client/audio_player_unittest.cc
index a6b5a5b..8084ee5 100644 (file)
--- a/src/remoting/client/audio_player_unittest.cc
+++ b/src/remoting/client/audio_player_unittest.cc
@@ -29,24 +29,19 @@ class FakeAudioPlayer : public AudioPlayer {
   FakeAudioPlayer() {
   }
 
-  virtual bool ResetAudioPlayer(AudioPacket::SamplingRate) OVERRIDE {
-    return true;
-  }
+  bool ResetAudioPlayer(AudioPacket::SamplingRate) override { return true; }
 
-  virtual uint32 GetSamplesPerFrame() OVERRIDE {
-    return kAudioSamplesPerFrame;
-  }
+  uint32 GetSamplesPerFrame() override { return kAudioSamplesPerFrame; }
 };
 
 class AudioPlayerTest : public ::testing::Test {
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
     audio_.reset(new FakeAudioPlayer());
     buffer_.reset(new char[kAudioFrameBytes + kPaddingBytes]);
   }
 
-  virtual void TearDown() {
-  }
+  void TearDown() override {}
 
   void ConsumeAudioFrame() {
     uint8* buffer = reinterpret_cast<uint8*>(buffer_.get());
@@ -118,33 +113,28 @@ scoped_ptr<AudioPacket> CreatePacket48000Hz(int samples) {
 TEST_F(AudioPlayerTest, Init) {
   ASSERT_EQ(0, GetNumQueuedPackets());
 
-  scoped_ptr<AudioPacket> packet(CreatePacket44100Hz(10));
-  audio_->ProcessAudioPacket(packet.Pass());
+  audio_->ProcessAudioPacket(CreatePacket44100Hz(10));
   ASSERT_EQ(1, GetNumQueuedPackets());
 }
 
 TEST_F(AudioPlayerTest, MultipleSamples) {
-  scoped_ptr<AudioPacket> packet1(CreatePacket44100Hz(10));
-  audio_->ProcessAudioPacket(packet1.Pass());
+  audio_->ProcessAudioPacket(CreatePacket44100Hz(10));
   ASSERT_EQ(10, GetNumQueuedSamples());
   ASSERT_EQ(1, GetNumQueuedPackets());
 
-  scoped_ptr<AudioPacket> packet2(CreatePacket44100Hz(20));
-  audio_->ProcessAudioPacket(packet2.Pass());
+  audio_->ProcessAudioPacket(CreatePacket44100Hz(20));
   ASSERT_EQ(30, GetNumQueuedSamples());
   ASSERT_EQ(2, GetNumQueuedPackets());
 }
 
 TEST_F(AudioPlayerTest, ChangeSampleRate) {
-  scoped_ptr<AudioPacket> packet1(CreatePacket44100Hz(10));
-  audio_->ProcessAudioPacket(packet1.Pass());
+  audio_->ProcessAudioPacket(CreatePacket44100Hz(10));
   ASSERT_EQ(10, GetNumQueuedSamples());
   ASSERT_EQ(1, GetNumQueuedPackets());
 
   // New packet with different sampling rate causes previous samples to
   // be removed.
-  scoped_ptr<AudioPacket> packet2(CreatePacket48000Hz(20));
-  audio_->ProcessAudioPacket(packet2.Pass());
+  audio_->ProcessAudioPacket(CreatePacket48000Hz(20));
   ASSERT_EQ(20, GetNumQueuedSamples());
   ASSERT_EQ(1, GetNumQueuedPackets());
 }
@@ -152,8 +142,7 @@ TEST_F(AudioPlayerTest, ChangeSampleRate) {
 TEST_F(AudioPlayerTest, ExceedLatency) {
   // Push about 4 seconds worth of samples.
   for (int i = 0; i < 100; ++i) {
-    scoped_ptr<AudioPacket> packet1(CreatePacket48000Hz(2000));
-    audio_->ProcessAudioPacket(packet1.Pass());
+    audio_->ProcessAudioPacket(CreatePacket48000Hz(2000));
   }
 
   // Verify that we don't have more than 0.5s.
@@ -168,9 +157,8 @@ TEST_F(AudioPlayerTest, ConsumePartialPacket) {
 
   // Process 100 samples.
   int packet1_samples = 100;
-  scoped_ptr<AudioPacket> packet(CreatePacket44100Hz(packet1_samples));
   total_samples += packet1_samples;
-  audio_->ProcessAudioPacket(packet.Pass());
+  audio_->ProcessAudioPacket(CreatePacket44100Hz(packet1_samples));
   ASSERT_EQ(total_samples, GetNumQueuedSamples());
   ASSERT_EQ(1, GetNumQueuedPackets());
   ASSERT_EQ(bytes_consumed, GetBytesConsumed());
@@ -197,16 +185,14 @@ TEST_F(AudioPlayerTest, ConsumeAcrossPackets) {
 
   // Packet 1.
   int packet1_samples = 20;
-  scoped_ptr<AudioPacket> packet1(CreatePacket44100Hz(packet1_samples));
   total_samples += packet1_samples;
-  audio_->ProcessAudioPacket(packet1.Pass());
+  audio_->ProcessAudioPacket(CreatePacket44100Hz(packet1_samples));
   ASSERT_EQ(total_samples, GetNumQueuedSamples());
 
   // Packet 2.
   int packet2_samples = 70;
-  scoped_ptr<AudioPacket> packet2(CreatePacket44100Hz(packet2_samples));
   total_samples += packet2_samples;
-  audio_->ProcessAudioPacket(packet2.Pass());
+  audio_->ProcessAudioPacket(CreatePacket44100Hz(packet2_samples));
   ASSERT_EQ(total_samples, GetNumQueuedSamples());
   ASSERT_EQ(bytes_consumed, GetBytesConsumed());
 
@@ -242,17 +228,15 @@ TEST_F(AudioPlayerTest, ConsumeEntirePacket) {
 
   // Packet 1.
   int packet1_samples = 50;
-  scoped_ptr<AudioPacket> packet1(CreatePacket44100Hz(packet1_samples));
   total_samples += packet1_samples;
-  audio_->ProcessAudioPacket(packet1.Pass());
+  audio_->ProcessAudioPacket(CreatePacket44100Hz(packet1_samples));
   ASSERT_EQ(total_samples, GetNumQueuedSamples());
   ASSERT_EQ(bytes_consumed, GetBytesConsumed());
 
   // Packet 2.
   int packet2_samples = 30;
-  scoped_ptr<AudioPacket> packet2(CreatePacket44100Hz(packet2_samples));
   total_samples += packet2_samples;
-  audio_->ProcessAudioPacket(packet2.Pass());
+  audio_->ProcessAudioPacket(CreatePacket44100Hz(packet2_samples));
   ASSERT_EQ(total_samples, GetNumQueuedSamples());
   ASSERT_EQ(bytes_consumed, GetBytesConsumed());
 
@@ -310,9 +294,8 @@ TEST_F(AudioPlayerTest, NotEnoughDataToConsume) {
 
   // Packet 1.
   int packet1_samples = 10;
-  scoped_ptr<AudioPacket> packet1(CreatePacket44100Hz(packet1_samples));
   total_samples += packet1_samples;
-  audio_->ProcessAudioPacket(packet1.Pass());
+  audio_->ProcessAudioPacket(CreatePacket44100Hz(packet1_samples));
   ASSERT_EQ(total_samples, GetNumQueuedSamples());
   ASSERT_EQ(bytes_consumed, GetBytesConsumed());