Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / media / audio / audio_output_proxy_unittest.cc

diff --git a/src/media/audio/audio_output_proxy_unittest.cc b/src/media/audio/audio_output_proxy_unittest.cc
index 0ccf78e..66f8987 100644 (file)
--- a/src/media/audio/audio_output_proxy_unittest.cc
+++ b/src/media/audio/audio_output_proxy_unittest.cc
@@ -25,7 +25,6 @@ using ::testing::NotNull;
 using ::testing::Return;
 using ::testing::SetArrayArgument;
 using media::AudioBus;
-using media::AudioBuffersState;
 using media::AudioInputStream;
 using media::AudioManager;
 using media::AudioManagerBase;
@@ -125,7 +124,7 @@ class MockAudioManager : public AudioManagerBase {
 
 class MockAudioSourceCallback : public AudioOutputStream::AudioSourceCallback {
  public:
-  int OnMoreData(AudioBus* audio_bus, AudioBuffersState buffers_state) {
+  int OnMoreData(AudioBus* audio_bus, uint32 total_bytes_delay) {
     audio_bus->Zero();
     return audio_bus->frames();
   }
@@ -138,7 +137,7 @@ namespace media {
 
 class AudioOutputProxyTest : public testing::Test {
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
     EXPECT_CALL(manager_, GetTaskRunner())
         .WillRepeatedly(Return(message_loop_.message_loop_proxy()));
     EXPECT_CALL(manager_, GetWorkerTaskRunner())
@@ -151,7 +150,7 @@ class AudioOutputProxyTest : public testing::Test {
     InitDispatcher(base::TimeDelta::FromMilliseconds(kTestCloseDelayMs));
   }
 
-  virtual void TearDown() {
+  void TearDown() override {
     // This is necessary to free all proxy objects that have been
     // closed by the test.
     message_loop_.RunUntilIdle();
@@ -414,11 +413,9 @@ class AudioOutputProxyTest : public testing::Test {
 
 class AudioOutputResamplerTest : public AudioOutputProxyTest {
  public:
-  virtual void TearDown() {
-    AudioOutputProxyTest::TearDown();
-  }
+  void TearDown() override { AudioOutputProxyTest::TearDown(); }
 
-  virtual void InitDispatcher(base::TimeDelta close_delay) OVERRIDE {
+  void InitDispatcher(base::TimeDelta close_delay) override {
     // Use a low sample rate and large buffer size when testing otherwise the
     // FakeAudioOutputStream will keep the message loop busy indefinitely; i.e.,
     // RunUntilIdle() will never terminate.
@@ -429,7 +426,7 @@ class AudioOutputResamplerTest : public AudioOutputProxyTest {
         &manager(), params_, resampler_params_, std::string(), close_delay);
   }
 
-  virtual void OnStart() OVERRIDE {
+  void OnStart() override {
     // Let Start() run for a bit.
     base::RunLoop run_loop;
     message_loop_.PostDelayedTask(