Remove BrowserPlugin's -internal-attach method

This CL exposes a much simpler content/public method:
void RenderView::AttachToBrowserPlugin(blink::WebNode&)

This removes BrowserPlugin's usage of NPAPI method bindings.
This will hopefully help us move towards using OOPIFs.

BUG=330264

Review URL: https://codereview.chromium.org/444813002

Cr-Commit-Position: refs/heads/master@{#291261}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291261 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 7 insertions, 11 deletions

diff --git a/content/public/browser/browser_plugin_guest_delegate.cc b/content/public/browser/browser_plugin_guest_delegate.cc
index f49b1f2..7491138 100644
--- a/content/public/browser/browser_plugin_guest_delegate.cc
+++ b/content/public/browser/browser_plugin_guest_delegate.cc
@@ -11,8 +11,4 @@ WebContents* BrowserPluginGuestDelegate::CreateNewGuestWindow(
   return NULL;
 }
 
-int BrowserPluginGuestDelegate::GetGuestInstanceID() const {
-  return 0;
-}
-
 }  // namespace content
diff --git a/content/public/browser/browser_plugin_guest_delegate.h b/content/public/browser/browser_plugin_guest_delegate.h
index 2818982..22a346b 100644
--- a/content/public/browser/browser_plugin_guest_delegate.h
+++ b/content/public/browser/browser_plugin_guest_delegate.h
@@ -28,8 +28,7 @@ class CONTENT_EXPORT BrowserPluginGuestDelegate {
 
   // Notification that the embedder will begin attachment. This is called
   // prior to resuming resource loads.
-  virtual void WillAttach(content::WebContents* embedder_web_contents,
-                          const base::DictionaryValue& extra_params) {}
+  virtual void WillAttach(content::WebContents* embedder_web_contents) {}
 
   virtual WebContents* CreateNewGuestWindow(
       const WebContents::CreateParams& create_params);
@@ -37,9 +36,6 @@ class CONTENT_EXPORT BrowserPluginGuestDelegate {
   // Notification that the embedder has completed attachment.
   virtual void DidAttach() {}
 
-  // Requests the instance ID associated with the delegate.
-  virtual int GetGuestInstanceID() const;
-
   // Notification that the BrowserPlugin has resized.
   virtual void ElementSizeChanged(const gfx::Size& old_size,
                                   const gfx::Size& new_size) {}
diff --git a/content/public/browser/browser_plugin_guest_manager.h b/content/public/browser/browser_plugin_guest_manager.h
index 9839dfb..f56cd2a 100644
--- a/content/public/browser/browser_plugin_guest_manager.h
+++ b/content/public/browser/browser_plugin_guest_manager.h
@@ -35,8 +35,8 @@ class CONTENT_EXPORT BrowserPluginGuestManager {
   // not own the requested guest, then the embedder will be killed,
   // and the |callback| will not be called.
   virtual void MaybeGetGuestByInstanceIDOrKill(
-      int guest_instance_id,
-      int embedder_render_process_id,
+      WebContents* embedder_web_contents,
+      int browser_plugin_instance_id,
       const GuestByInstanceIDCallback& callback) {}
 
   // Iterates over all WebContents belonging to a given |embedder_web_contents|,
diff --git a/content/public/renderer/render_frame.h b/content/public/renderer/render_frame.h
index a0bee71..c25e5fc 100644
--- a/content/public/renderer/render_frame.h
+++ b/content/public/renderer/render_frame.h
@@ -95,6 +95,10 @@ class CONTENT_EXPORT RenderFrame : public IPC::Listener,
   // Returns true if this frame is a FTP directory listing.
   virtual bool IsFTPDirectoryListing() = 0;
 
+  // Attaches the browser plugin identified by |element_instance_id| to guest
+  // content created by the embedder.
+  virtual void AttachGuest(int element_instance_id) = 0;
+
  protected:
   virtual ~RenderFrame() {}