Add RunCallback to invoke a callback parameter in unittests.

media/filters/audio_renderer_impl_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/gtest_prod_util.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "media/base/data_buffer.h"
+#include "media/base/gmock_callback_support.h"
 #include "media/base/mock_audio_renderer_sink.h"
 #include "media/base/mock_callback.h"
 #include "media/base/mock_filters.h"
 #include "media/filters/audio_renderer_impl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 using ::testing::AnyNumber;
 using ::testing::Invoke;
 using ::testing::Return;
 using ::testing::NiceMock;
 using ::testing::StrictMock;
 
-ACTION_P(RunPipelineStatusCB1, status) {
-  arg1.Run(status);
-}
-
 namespace media {
 
 // Constants for distinguishing between muted audio and playing audio when using
 // ConsumeBufferedData().
 static uint8 kMutedAudio = 0x00;
 static uint8 kPlayingAudio = 0x99;
 
 class AudioRendererImplTest : public ::testing::Test {
  public:
   // Give the decoder some non-garbage media properties.
@@ skipping 55 matching lines @@
   MOCK_METHOD0(OnDisabled, void());
   MOCK_METHOD1(OnError, void(PipelineStatus));
 
   void OnAudioTimeCallback(
       base::TimeDelta current_time, base::TimeDelta max_time) {
     CHECK(current_time <= max_time);
   }
 
   void Initialize() {
     EXPECT_CALL(*decoder_, Initialize(_, _, _))
-        .WillOnce(RunPipelineStatusCB1(PIPELINE_OK));
+        .WillOnce(RunCallback<1>(PIPELINE_OK));
 
     InitializeWithStatus(PIPELINE_OK);
     message_loop_.RunUntilIdle();
   }
 
   void InitializeWithStatus(PipelineStatus expected) {
     renderer_->Initialize(
         demuxer_stream_,
         decoders_,
         NewExpectedStatusCB(expected),
@@ skipping 125 matching lines @@
   void SaveReadCallback(const AudioDecoder::ReadCB& callback) {
     CHECK(read_cb_.is_null()) << "Overlapping reads are not permitted";
     read_cb_ = callback;
   }
 
   DISALLOW_COPY_AND_ASSIGN(AudioRendererImplTest);
 };
 
 TEST_F(AudioRendererImplTest, Initialize_Failed) {
   EXPECT_CALL(*decoder_, Initialize(_, _, _))
-      .WillOnce(RunPipelineStatusCB1(PIPELINE_OK));
+      .WillOnce(RunCallback<1>(PIPELINE_OK));
   SetUnsupportedAudioDecoderProperties();
 
   InitializeWithStatus(PIPELINE_ERROR_INITIALIZATION_FAILED);
 
   // We should have no reads.
   EXPECT_TRUE(read_cb_.is_null());
 }
 
 TEST_F(AudioRendererImplTest, Initialize_Successful) {
   Initialize();
 
   // We should have no reads.
   EXPECT_TRUE(read_cb_.is_null());
 }
 
 TEST_F(AudioRendererImplTest, Initialize_DecoderInitFailure) {
   EXPECT_CALL(*decoder_, Initialize(_, _, _))
-      .WillOnce(RunPipelineStatusCB1(PIPELINE_ERROR_DECODE));
+      .WillOnce(RunCallback<1>(PIPELINE_ERROR_DECODE));
   InitializeWithStatus(PIPELINE_ERROR_DECODE);
 
   // We should have no reads.
   EXPECT_TRUE(read_cb_.is_null());
 }
 
 TEST_F(AudioRendererImplTest, Initialize_MultipleDecoders) {
   scoped_refptr<MockAudioDecoder> decoder1 = new MockAudioDecoder();
   // Insert |decoder1| as the first decoder in the list.
   decoders_.push_front(decoder1);
   EXPECT_CALL(*decoder1, Initialize(_, _, _))
-      .WillOnce(RunPipelineStatusCB1(DECODER_ERROR_NOT_SUPPORTED));
+      .WillOnce(RunCallback<1>(DECODER_ERROR_NOT_SUPPORTED));
   EXPECT_CALL(*decoder_, Initialize(_, _, _))
-      .WillOnce(RunPipelineStatusCB1(PIPELINE_OK));
+      .WillOnce(RunCallback<1>(PIPELINE_OK));
   InitializeWithStatus(PIPELINE_OK);
 
   // We should have no reads.
   EXPECT_TRUE(read_cb_.is_null());
 }
 
 TEST_F(AudioRendererImplTest, Preroll) {
   Initialize();
   Preroll();
 }
@@ skipping 180 matching lines @@
   EXPECT_TRUE(ConsumeBufferedData(bytes_buffered() / 2, NULL));
 
   renderer_->Pause(NewExpectedClosure());
 
   AbortPendingRead();
 
   Preroll(base::TimeDelta::FromSeconds(1));
 }
 
 }  // namespace media