Media Remoting: Don't report remote renderer init error to pipeline.

media/remoting/courier_renderer.cc

 // Copyright 2016 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/remoting/courier_renderer.h"
 
 #include <algorithm>
 #include <limits>
 #include <utility>
 
@@ skipping 301 matching lines @@
 
 void CourierRenderer::OnDataPipeCreated(
     mojom::RemotingDataStreamSenderPtrInfo audio,
     mojom::RemotingDataStreamSenderPtrInfo video,
     mojo::ScopedDataPipeProducerHandle audio_handle,
     mojo::ScopedDataPipeProducerHandle video_handle,
     int audio_rpc_handle,
     int video_rpc_handle) {
   VLOG(2) << __func__;
   DCHECK(media_task_runner_->BelongsToCurrentThread());
   DCHECK(!init_workflow_done_callback_.is_null());

[miu, 2017/02/02 20:50:16]

Could this DCHECK() trip? Probably not, but maybe we should move it to after the
|state_| check a few lines below...

[xjz, 2017/02/02 22:07:11]

Done. I couldn't think of a case that this DCHECK fails. But anyway, it doesn't
hurt moving it a few lines below. :)

 
   if (state_ == STATE_ERROR)
     return;  // Abort because something went wrong in the meantime.
   DCHECK_EQ(state_, STATE_CREATE_PIPE);
 
   // Create audio demuxer stream adapter if audio is available.
   DemuxerStream* audio_demuxer_stream =
       demuxer_stream_provider_->GetStream(DemuxerStream::AUDIO);
   if (audio_demuxer_stream && audio.is_valid() && audio_handle.is_valid() &&
       audio_rpc_handle != RpcBroker::kInvalidHandle) {
@@ skipping 333 matching lines @@
   // controller will cause this renderer to shut down shortly.
   if (state_ != STATE_ERROR) {
     state_ = STATE_ERROR;
     main_task_runner_->PostTask(
         FROM_HERE, base::Bind(&RendererController::OnRendererFatalError,
                               controller_, stop_trigger));
   }
 
   data_flow_poll_timer_.Stop();
 
+  // This renderer will be shut down shortly. To prevent breaking the pipeline,
+  // just run the callback without reporting error.
   if (!init_workflow_done_callback_.is_null()) {
-    base::ResetAndReturn(&init_workflow_done_callback_)
-        .Run(PIPELINE_ERROR_INITIALIZATION_FAILED);
+    base::ResetAndReturn(&init_workflow_done_callback_).Run(PIPELINE_OK);
     return;
   }
 
   if (!flush_cb_.is_null())
     base::ResetAndReturn(&flush_cb_).Run();
 }
 
 // static
 void CourierRenderer::RequestUpdateInterstitialOnMainThread(
     scoped_refptr<base::SingleThreadTaskRunner> media_task_runner,
@@ skipping 153 matching lines @@
         kBytesPerKilobit;
     DCHECK_GE(kilobits_per_second, 0);
     const base::CheckedNumeric<int> checked_kbps = kilobits_per_second;
     metrics_recorder_.OnVideoRateEstimate(
         checked_kbps.ValueOrDefault(std::numeric_limits<int>::max()));
   }
 }
 
 }  // namespace remoting
 }  // namespace media