media: Always provide CdmContext when selecting decoder in DecoderStream

content/renderer/media/cdm/ppapi_decryptor.h

 // 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_CDM_PPAPI_DECRYPTOR_H_
 #define CONTENT_RENDERER_MEDIA_CDM_PPAPI_DECRYPTOR_H_
 
 #include <stdint.h>
 
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
+#include "base/synchronization/lock.h"
 #include "content/renderer/media/cdm/pepper_cdm_wrapper.h"
 #include "media/base/cdm_context.h"
 #include "media/base/cdm_factory.h"
 #include "media/base/content_decryption_module.h"
 #include "media/base/decryptor.h"
 #include "media/base/video_decoder_config.h"
 
 class GURL;
 
 namespace base {
@@ skipping 115 matching lines @@
   media::SessionKeysChangeCB session_keys_change_cb_;
   media::SessionExpirationUpdateCB session_expiration_update_cb_;
 
   scoped_refptr<base::SingleThreadTaskRunner> render_task_runner_;
 
   DecoderInitCB audio_decoder_init_cb_;
   DecoderInitCB video_decoder_init_cb_;
   NewKeyCB new_audio_key_cb_;
   NewKeyCB new_video_key_cb_;
 
+  base::Lock lock_;  // Protects |had_fatal_plugin_error_|.
+  bool had_fatal_plugin_error_ = false;
+
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<PpapiDecryptor> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PpapiDecryptor);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_CDM_PPAPI_DECRYPTOR_H_