Introduce CdmContext interface.

content/renderer/media/crypto/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_CRYPTO_PPAPI_DECRYPTOR_H_
 #define CONTENT_RENDERER_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "content/renderer/media/crypto/pepper_cdm_wrapper.h"
+#include "media/base/cdm_context.h"
 #include "media/base/decryptor.h"
 #include "media/base/media_keys.h"
 #include "media/base/video_decoder_config.h"
 
 class GURL;
 
 namespace base {
 class MessageLoopProxy;
 }
 
 namespace content {
 class ContentDecryptorDelegate;
 class PepperPluginInstanceImpl;
 
 // PpapiDecryptor implements media::MediaKeys and media::Decryptor and forwards
 // all calls to the PluginInstance.
 // This class should always be created & destroyed on the main renderer thread.
-class PpapiDecryptor : public media::MediaKeys, public media::Decryptor {
+class PpapiDecryptor : public media::MediaKeys,
+                       public media::CdmContext,
+                       public media::Decryptor {
  public:
   static scoped_ptr<PpapiDecryptor> Create(
       const std::string& key_system,
       const GURL& security_origin,
       const CreatePepperCdmCB& create_pepper_cdm_cb,
       const media::SessionMessageCB& session_message_cb,
       const media::SessionReadyCB& session_ready_cb,
       const media::SessionClosedCB& session_closed_cb,
       const media::SessionErrorCB& session_error_cb,
       const media::SessionKeysChangeCB& session_keys_change_cb,
@@ skipping 16 matching lines @@
   void UpdateSession(const std::string& web_session_id,
                      const uint8* response,
                      int response_length,
                      scoped_ptr<media::SimpleCdmPromise> promise) override;
   void CloseSession(const std::string& web_session_id,
                     scoped_ptr<media::SimpleCdmPromise> promise) override;
   void RemoveSession(const std::string& web_session_id,
                      scoped_ptr<media::SimpleCdmPromise> promise) override;
   void GetUsableKeyIds(const std::string& web_session_id,
                        scoped_ptr<media::KeyIdsPromise> promise) override;
+  CdmContext* GetCdmContext() override;
+
+  // media::CdmContext implementation.
   Decryptor* GetDecryptor() override;
 
   // media::Decryptor implementation.
   void RegisterNewKeyCB(StreamType stream_type,
                         const NewKeyCB& key_added_cb) override;
   void Decrypt(StreamType stream_type,
                const scoped_refptr<media::DecoderBuffer>& encrypted,
                const DecryptCB& decrypt_cb) override;
   void CancelDecrypt(StreamType stream_type) override;
   void InitializeAudioDecoder(const media::AudioDecoderConfig& config,
@@ skipping 67 matching lines @@
 
   // 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_CRYPTO_PPAPI_DECRYPTOR_H_