Replace MockFilterCallback with MockCallback and simplify unit tests.

media/filters/decoder_base_unittest.cc

 // Copyright (c) 2010 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 <vector>
 
+#include "media/base/mock_callback.h"
 #include "media/base/mock_filters.h"
 #include "media/base/mock_task.h"
 #include "media/filters/decoder_base.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 using ::testing::NotNull;
 using ::testing::StrictMock;
 using ::testing::WithArg;
@@ skipping 97 matching lines @@
 //   \ ReadCallback() -> client
 // - DecodeCallback() -> DecoderBase
 //   \ ReadCallback() -> client
 TEST(DecoderBaseTest, FlowControl) {
   MessageLoop message_loop;
   scoped_refptr<MockDecoderImpl> decoder(new MockDecoderImpl());
   MockDecoderCallback read_callback;
   decoder->set_consume_audio_samples_callback(
       NewCallback(&read_callback, &MockDecoderCallback::OnReadComplete));
   scoped_refptr<MockDemuxerStream> demuxer_stream(new MockDemuxerStream());
-  StrictMock<MockFilterCallback> callback;
   decoder->set_message_loop(&message_loop);
 
   // Initailize.
-  EXPECT_CALL(callback, OnFilterCallback());
-  EXPECT_CALL(callback, OnCallbackDestroyed());
   EXPECT_CALL(*decoder, DoInitialize(NotNull(), NotNull(), NotNull()))
       .WillOnce(Initialize());
-  decoder->Initialize(demuxer_stream.get(), callback.NewCallback());
+  decoder->Initialize(demuxer_stream.get(), NewExpectedCallback());
   message_loop.RunAllPending();
 
   // Read.
   std::vector<scoped_refptr<Buffer> > decode_requests;
   EXPECT_CALL(*demuxer_stream, Read(NotNull()))
       .Times(2)
       .WillRepeatedly(CompleteDemuxRequest());
   EXPECT_CALL(*decoder, DoDecode(NotNull()))
       .Times(2)
       .WillRepeatedly(SaveDecodeRequest(&decode_requests));
   scoped_refptr<MockDecoderOutput> output;
   decoder->ProduceAudioSamples(output);
   decoder->ProduceAudioSamples(output);
   message_loop.RunAllPending();
 
   // Fulfill the decode request.
   EXPECT_CALL(read_callback, OnReadComplete(_)).Times(2);
   for (size_t i = 0; i < decode_requests.size(); ++i) {
     decoder->EnqueueResult(new MockDecoderOutput());
     decoder->OnDecodeComplete();
   }
   decode_requests.clear();
   message_loop.RunAllPending();
 
   // Stop.
   EXPECT_CALL(*decoder, DoStop(_))
       .WillOnce(WithArg<0>(InvokeRunnable()));
-  EXPECT_CALL(callback, OnFilterCallback());
-  EXPECT_CALL(callback, OnCallbackDestroyed());
-  decoder->Stop(callback.NewCallback());
+  decoder->Stop(NewExpectedCallback());
   message_loop.RunAllPending();
 }
 
 }  // namespace media