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

media/filters/fake_video_decoder.cc

 // Copyright 2013 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/filters/fake_video_decoder.h"
 
 #include "base/location.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "media/base/bind_to_current_loop.h"
 #include "media/base/test_helpers.h"
@@ skipping 29 matching lines @@
 
   decoded_frames_.clear();
 }
 
 std::string FakeVideoDecoder::GetDisplayName() const {
   return "FakeVideoDecoder";
 }
 
 void FakeVideoDecoder::Initialize(const VideoDecoderConfig& config,
                                   bool low_delay,
-                                  const PipelineStatusCB& status_cb,
+                                  const InitCB& init_cb,
                                   const OutputCB& output_cb) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(config.IsValidConfig());
   DCHECK(held_decode_callbacks_.empty())
       << "No reinitialization during pending decode.";
   DCHECK(reset_cb_.IsNull()) << "No reinitialization during pending reset.";
 
   current_config_ = config;
-  init_cb_.SetCallback(BindToCurrentLoop(status_cb));
+  init_cb_.SetCallback(BindToCurrentLoop(init_cb));
 
   // Don't need BindToCurrentLoop() because |output_cb_| is only called from
   // RunDecodeCallback() which is posted from Decode().
   output_cb_ = output_cb;
 
   if (!decoded_frames_.empty()) {
     DVLOG(1) << "Decoded frames dropped during reinitialization.";
     decoded_frames_.clear();
   }
 
   if (fail_to_initialize_) {
     state_ = STATE_ERROR;
-    init_cb_.RunOrHold(DECODER_ERROR_NOT_SUPPORTED);
+    init_cb_.RunOrHold(false);
   } else {
     state_ = STATE_NORMAL;
-    init_cb_.RunOrHold(PIPELINE_OK);
+    init_cb_.RunOrHold(true);
   }
 }
 
 void FakeVideoDecoder::Decode(const scoped_refptr<DecoderBuffer>& buffer,
                               const DecodeCB& decode_cb) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(reset_cb_.IsNull());
   DCHECK_LE(decoded_frames_.size(),
             decoding_delay_ + held_decode_callbacks_.size());
   DCHECK_LT(static_cast<int>(held_decode_callbacks_.size()),
@@ skipping 166 matching lines @@
 
 void FakeVideoDecoder::DoReset() {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(held_decode_callbacks_.empty());
   DCHECK(!reset_cb_.IsNull());
 
   reset_cb_.RunOrHold();
 }
 
 }  // namespace media