Create a public API around webkit::ppapi::PluginInstance and use it in chrome. After this, webkit/p…

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 "media/base/decryptor.h"
 #include "media/base/media_keys.h"
 #include "media/base/video_decoder_config.h"
 
 namespace base {
 class MessageLoopProxy;
 }
 
 namespace webkit {
 namespace ppapi {
 class ContentDecryptorDelegate;
-class PluginInstance;
+class PluginInstanceImpl;
 }
 }
 
 namespace content {
 
 // PpapiDecryptor implements 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 {
  public:
   static scoped_ptr<PpapiDecryptor> Create(
       // TODO(ddorwin): Remove after updating the delegate.
       const std::string& key_system,
-      const scoped_refptr<webkit::ppapi::PluginInstance>& plugin_instance,
+      const scoped_refptr<webkit::ppapi::PluginInstanceImpl>& plugin_instance,
       const media::KeyAddedCB& key_added_cb,
       const media::KeyErrorCB& key_error_cb,
       const media::KeyMessageCB& key_message_cb,
       const base::Closure& destroy_plugin_cb);
 
   virtual ~PpapiDecryptor();
 
   // media::MediaKeys implementation.
   virtual bool GenerateKeyRequest(const std::string& type,
                                   const uint8* init_data,
@@ skipping 19 matching lines @@
       const scoped_refptr<media::DecoderBuffer>& encrypted,
       const AudioDecodeCB& audio_decode_cb) OVERRIDE;
   virtual void DecryptAndDecodeVideo(
       const scoped_refptr<media::DecoderBuffer>& encrypted,
       const VideoDecodeCB& video_decode_cb) OVERRIDE;
   virtual void ResetDecoder(StreamType stream_type) OVERRIDE;
   virtual void DeinitializeDecoder(StreamType stream_type) OVERRIDE;
 
  private:
   PpapiDecryptor(
-      const scoped_refptr<webkit::ppapi::PluginInstance>& plugin_instance,
+      const scoped_refptr<webkit::ppapi::PluginInstanceImpl>& plugin_instance,
       webkit::ppapi::ContentDecryptorDelegate* plugin_cdm_delegate,
       const media::KeyAddedCB& key_added_cb,
       const media::KeyErrorCB& key_error_cb,
       const media::KeyMessageCB& key_message_cb,
       const base::Closure& destroy_plugin_cb);
 
   void ReportFailureToCallPlugin(const std::string& session_id);
 
   void OnDecoderInitialized(StreamType stream_type, bool success);
 
   // Callbacks for |plugin_cdm_delegate_| to fire key events.
   void KeyAdded(const std::string& session_id);
   void KeyError(const std::string& session_id,
                 media::MediaKeys::KeyError error_code,
                 int system_code);
   void KeyMessage(const std::string& session_id,
                   const std::vector<uint8>& message,
                   const std::string& default_url);
 
   // Hold a reference of the plugin instance to make sure the plugin outlives
   // the |plugin_cdm_delegate_|. This is needed because |plugin_cdm_delegate_|
   // is owned by the |plugin_instance_|.
-  scoped_refptr<webkit::ppapi::PluginInstance> plugin_instance_;
+  scoped_refptr<webkit::ppapi::PluginInstanceImpl> plugin_instance_;
 
   webkit::ppapi::ContentDecryptorDelegate* plugin_cdm_delegate_;
 
   // Callbacks for firing key events.
   media::KeyAddedCB key_added_cb_;
   media::KeyErrorCB key_error_cb_;
   media::KeyMessageCB key_message_cb_;
 
   // Called to destroy the helper plugin when this class no longer needs it.
   base::Closure destroy_plugin_cb_;
 
   scoped_refptr<base::MessageLoopProxy> render_loop_proxy_;
 
   DecoderInitCB audio_decoder_init_cb_;
   DecoderInitCB video_decoder_init_cb_;
   NewKeyCB new_audio_key_cb_;
   NewKeyCB new_video_key_cb_;
 
   base::WeakPtrFactory<PpapiDecryptor> weak_ptr_factory_;
   base::WeakPtr<PpapiDecryptor> weak_this_;
 
   DISALLOW_COPY_AND_ASSIGN(PpapiDecryptor);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_