Bind plugin placeholder directly to v8 instead of over CppBoundClass

components/plugins/renderer/plugin_placeholder.h

Index: components/plugins/renderer/plugin_placeholder.h
diff --git a/components/plugins/renderer/plugin_placeholder.h b/components/plugins/renderer/plugin_placeholder.h
index 2fa6116a921c49a45eee816a4a1163780a01859e..252cb9d927200b7d0848952c210aed60c5cff2ef 100644
--- a/components/plugins/renderer/plugin_placeholder.h
+++ b/components/plugins/renderer/plugin_placeholder.h
@@ -5,13 +5,18 @@
 #ifndef COMPONENTS_PLUGINS_RENDERER_PLUGIN_PLACEHOLDER_H_
 #define COMPONENTS_PLUGINS_RENDERER_PLUGIN_PLACEHOLDER_H_
 
+#include <map>
+#include <string>
+
+#include "base/callback_forward.h"
+#include "base/memory/weak_ptr.h"
 #include "components/plugins/renderer/webview_plugin.h"
 #include "content/public/common/webplugininfo.h"
 #include "content/public/renderer/context_menu_client.h"
 #include "content/public/renderer/render_process_observer.h"
 #include "content/public/renderer/render_view_observer.h"
 #include "third_party/WebKit/public/web/WebPluginParams.h"
-#include "webkit/renderer/cpp_bound_class.h"
+#include "v8/include/v8.h"
 
 namespace content {
 struct WebPluginInfo;
@@ -21,7 +26,6 @@ namespace plugins {
 // Placeholders can be used if a plug-in is missing or not available
 // (blocked or disabled).
 class PluginPlaceholder : public content::RenderViewObserver,
-                          public webkit_glue::CppBoundClass,
                           public WebViewPlugin::Delegate {
  public:
 
@@ -44,6 +48,12 @@ class PluginPlaceholder : public content::RenderViewObserver,
 
   virtual ~PluginPlaceholder();
 
+  // Derived classes should invoke this method to install additional callbacks
+  // on the window.plugin object. When a callback is invoked, it will be
+  // forwarded to |callback|.
+  void RegisterCallback(const std::string& callback_name,
+                        const base::Closure& callback);
+
   void OnLoadBlockedPlugins(const std::string& identifier);
   void OnSetIsPrerendering(bool is_prerendering);
 
@@ -74,19 +84,14 @@ class PluginPlaceholder : public content::RenderViewObserver,
   virtual void ShowContextMenu(const blink::WebMouseEvent&) OVERRIDE;
 
   // Javascript callbacks:
-  // All ignore arguments (which are, however, required by caller) and return
-  // nothing.
 
   // Load the blocked plugin by calling LoadPlugin().
-  void LoadCallback(const webkit_glue::CppArgumentList& args,
-                    webkit_glue::CppVariant* result);
+  void LoadCallback();
 
   // Hide the blocked plugin by calling HidePlugin().
-  void HideCallback(const webkit_glue::CppArgumentList& args,
-                    webkit_glue::CppVariant* result);
+  void HideCallback();
 
-  void DidFinishLoadingCallback(const webkit_glue::CppArgumentList& args,
-                                webkit_glue::CppVariant* result);
+  void DidFinishLoadingCallback();
 
   void UpdateMessage();
 
@@ -107,6 +112,10 @@ class PluginPlaceholder : public content::RenderViewObserver,
   bool finished_loading_;
   std::string identifier_;
 
+  std::map<std::string, base::Closure> callbacks_;
+
+  base::WeakPtrFactory<PluginPlaceholder> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(PluginPlaceholder);
 };