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

media/cast/sender/h264_vt_encoder_unittest.cc

 // Copyright 2014 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 <queue>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/power_monitor/power_monitor.h"
@@ skipping 47 matching lines @@
       argc, argv,
       base::Bind(&MediaTestSuite::Run, base::Unretained(&test_suite)));
 }
 
 namespace media {
 namespace cast {
 
 // See comment in end2end_unittest.cc for details on this value.
 const double kVideoAcceptedPSNR = 38.0;
 
-void SavePipelineStatus(PipelineStatus* out_status, PipelineStatus in_status) {
-  *out_status = in_status;
+void SaveDecoderInitResult(bool* out_result, bool in_result) {
+  *out_result = in_result;
 }
 
 void SaveOperationalStatus(OperationalStatus* out_status,
                            OperationalStatus in_status) {
   *out_status = in_status;
 }
 
 class MetadataRecorder : public base::RefCountedThreadSafe<MetadataRecorder> {
  public:
   MetadataRecorder() : count_frames_delivered_(0) {}
@@ skipping 45 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(MetadataRecorder);
 };
 
 class EndToEndFrameChecker
     : public base::RefCountedThreadSafe<EndToEndFrameChecker> {
  public:
   explicit EndToEndFrameChecker(const VideoDecoderConfig& config)
       : decoder_(base::MessageLoop::current()->task_runner()),
         count_frames_checked_(0) {
-    PipelineStatus pipeline_status;
+    bool decoder_init_result;
     decoder_.Initialize(
-        config, false, base::Bind(&SavePipelineStatus, &pipeline_status),
+        config, false, base::Bind(&SaveDecoderInitResult, &decoder_init_result),
         base::Bind(&EndToEndFrameChecker::CompareFrameWithExpected,
                    base::Unretained(this)));
     base::MessageLoop::current()->RunUntilIdle();
-    EXPECT_EQ(PIPELINE_OK, pipeline_status);
+    EXPECT_TRUE(decoder_init_result);
   }
 
   void PushExpectation(const scoped_refptr<VideoFrame>& frame) {
     expectations_.push(frame);
   }
 
   void EncodeDone(scoped_ptr<SenderEncodedFrame> encoded_frame) {
     auto buffer = DecoderBuffer::CopyFrom(encoded_frame->bytes(),
                                           encoded_frame->data.size());
     decoder_.Decode(buffer, base::Bind(&EndToEndFrameChecker::DecodeDone,
@@ skipping 252 matching lines @@
       gfx::Size(kVideoWidth, kVideoHeight), base::TimeDelta()));
 
   // After a power resume event, the factory should produce frames right away
   // because the encoder re-initializes on its own.
   power_source_->GenerateResumeEvent();
   CreateFrameAndMemsetPlane(video_frame_factory.get());
 }
 
 }  // namespace cast
 }  // namespace media