media: Always provide CdmContext when selecting decoder in DecoderStream

content/renderer/media/cdm/ppapi_decryptor.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 "content/renderer/media/cdm/ppapi_decryptor.h"
 
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 187 matching lines @@
   }
 
   CdmDelegate()->RemoveSession(session_id, std::move(promise));
 }
 
 media::CdmContext* PpapiDecryptor::GetCdmContext() {
   return this;
 }
 
 media::Decryptor* PpapiDecryptor::GetDecryptor() {
-  return this;
+  base::AutoLock auto_lock(lock_);
+  return had_fatal_plugin_error_ ? nullptr : this;
 }
 
 int PpapiDecryptor::GetCdmId() const {
   return kInvalidCdmId;
 }
 
 void PpapiDecryptor::RegisterNewKeyCB(StreamType stream_type,
                                       const NewKeyCB& new_key_cb) {
   if (!render_task_runner_->BelongsToCurrentThread()) {
     render_task_runner_->PostTask(
@@ skipping 210 matching lines @@
 
 void PpapiDecryptor::AttemptToResumePlayback() {
   if (!new_audio_key_cb_.is_null())
     new_audio_key_cb_.Run();
 
   if (!new_video_key_cb_.is_null())
     new_video_key_cb_.Run();
 }
 
 void PpapiDecryptor::OnFatalPluginError() {
+  DVLOG(1) << __func__;
   DCHECK(render_task_runner_->BelongsToCurrentThread());
   pepper_cdm_wrapper_.reset();
+
+  base::AutoLock auto_lock(lock_);
+  had_fatal_plugin_error_ = true;
 }
 
 ContentDecryptorDelegate* PpapiDecryptor::CdmDelegate() {
   DCHECK(render_task_runner_->BelongsToCurrentThread());
   return (pepper_cdm_wrapper_) ? pepper_cdm_wrapper_->GetCdmDelegate() : NULL;
 }
 
 }  // namespace content