media: Reland "Simplify {Audio|Video}Decoder initialization callback."

media/base/test_helpers.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 "media/base/test_helpers.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/pickle.h"
 #include "base/run_loop.h"
 #include "base/test/test_timeouts.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "media/base/audio_buffer.h"
 #include "media/base/bind_to_current_loop.h"
 #include "media/base/decoder_buffer.h"
 #include "ui/gfx/geometry/rect.h"
 
 using ::testing::_;
 using ::testing::StrictMock;
 
 namespace media {
 
 // Utility mock for testing methods expecting Closures and PipelineStatusCBs.
 class MockCallback : public base::RefCountedThreadSafe<MockCallback> {
  public:
   MockCallback();
   MOCK_METHOD0(Run, void());
+  MOCK_METHOD1(RunWithBool, void(bool));
   MOCK_METHOD1(RunWithStatus, void(PipelineStatus));
 
  protected:
   friend class base::RefCountedThreadSafe<MockCallback>;
   virtual ~MockCallback();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockCallback);
 };
 
 MockCallback::MockCallback() {}
 MockCallback::~MockCallback() {}
 
 base::Closure NewExpectedClosure() {
   StrictMock<MockCallback>* callback = new StrictMock<MockCallback>();
   EXPECT_CALL(*callback, Run());
   return base::Bind(&MockCallback::Run, callback);
 }
 
+base::Callback<void(bool)> NewExpectedBoolCB(bool success) {
+  StrictMock<MockCallback>* callback = new StrictMock<MockCallback>();
+  EXPECT_CALL(*callback, RunWithBool(success));
+  return base::Bind(&MockCallback::RunWithBool, callback);
+}
+
 PipelineStatusCB NewExpectedStatusCB(PipelineStatus status) {
   StrictMock<MockCallback>* callback = new StrictMock<MockCallback>();
   EXPECT_CALL(*callback, RunWithStatus(status));
   return base::Bind(&MockCallback::RunWithStatus, callback);
 }
 
 WaitableMessageLoopEvent::WaitableMessageLoopEvent()
     : message_loop_(base::MessageLoop::current()),
       signaled_(false),
       status_(PIPELINE_OK) {
@@ skipping 207 matching lines @@
   expecting_b_ = false;
 }
 
 void AddLogEntryForTest(MediaLog::MediaLogLevel level,
                         const std::string& message) {
   DVLOG(1) << "Media log (" << MediaLog::MediaLogLevelToString(level)
            << "): " << message;
 }
 
 }  // namespace media