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

content/renderer/media/crypto/content_decryption_module_factory.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/crypto/content_decryption_module_factory.h"
 
 #include "base/logging.h"
 #include "content/renderer/media/crypto/key_systems.h"
 #include "media/crypto/aes_decryptor.h"
 
 #if defined(ENABLE_PEPPER_CDMS)
 #include "content/renderer/media/crypto/ppapi_decryptor.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebMediaPlayerClient.h"
-#include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
+#include "webkit/plugins/ppapi/ppapi_plugin_instance_impl.h"
 #include "webkit/plugins/ppapi/ppapi_webplugin_impl.h"
 #elif defined(OS_ANDROID)
 #include "content/renderer/media/android/proxy_media_keys.h"
 #include "content/renderer/media/android/webmediaplayer_proxy_android.h"
 #endif  // defined(ENABLE_PEPPER_CDMS)
 
 namespace content {
 
 #if defined(ENABLE_PEPPER_CDMS)
-// Returns the PluginInstance associated with the Helper Plugin.
+// Returns the PluginInstanceImpl associated with the Helper Plugin.
 // If a non-NULL pointer is returned, the caller must call closeHelperPlugin()
 // when the Helper Plugin is no longer needed.
-static scoped_refptr<webkit::ppapi::PluginInstance> CreateHelperPlugin(
+static scoped_refptr<webkit::ppapi::PluginInstanceImpl> CreateHelperPlugin(
     const std::string& plugin_type,
     WebKit::WebMediaPlayerClient* web_media_player_client,
     WebKit::WebFrame* web_frame) {
   DCHECK(web_media_player_client);
   DCHECK(web_frame);
 
   WebKit::WebPlugin* web_plugin = web_media_player_client->createHelperPlugin(
       WebKit::WebString::fromUTF8(plugin_type), web_frame);
   if (!web_plugin)
     return NULL;
@@ skipping 11 matching lines @@
     const media::KeyErrorCB& key_error_cb,
     const media::KeyMessageCB& key_message_cb,
     const base::Closure& destroy_plugin_cb,
     WebKit::WebMediaPlayerClient* web_media_player_client,
     WebKit::WebFrame* web_frame) {
   DCHECK(web_media_player_client);
   DCHECK(web_frame);
 
   std::string plugin_type = GetPepperType(key_system);
   DCHECK(!plugin_type.empty());
-  const scoped_refptr<webkit::ppapi::PluginInstance>& plugin_instance =
+  const scoped_refptr<webkit::ppapi::PluginInstanceImpl>& plugin_instance =
       CreateHelperPlugin(plugin_type, web_media_player_client, web_frame);
   if (!plugin_instance.get()) {
     DLOG(ERROR) << "ProxyDecryptor: plugin instance creation failed.";
     return scoped_ptr<media::MediaKeys>();
   }
 
   scoped_ptr<PpapiDecryptor> decryptor =
       PpapiDecryptor::Create(key_system,
                              plugin_instance,
                              key_added_cb,
@@ skipping 47 matching lines @@
   scoped_ptr<ProxyMediaKeys> proxy_media_keys(
       new ProxyMediaKeys(proxy, media_keys_id));
   proxy_media_keys->InitializeCDM(key_system);
   return proxy_media_keys.PassAs<media::MediaKeys>();
 #else
   return scoped_ptr<media::MediaKeys>();
 #endif  // defined(ENABLE_PEPPER_CDMS)
 }
 
 }  // namespace content