Remove BrowserPlugin's -internal-attach method

content/renderer/browser_plugin/browser_plugin_manager.cc

Index: content/renderer/browser_plugin/browser_plugin_manager.cc
diff --git a/content/renderer/browser_plugin/browser_plugin_manager.cc b/content/renderer/browser_plugin/browser_plugin_manager.cc
index 03120d82f7889fc70dd1dd958f89e788cdc2ace1..d15e18821dd6a4c39560a0abd1936dcc7db199b9 100644
--- a/content/renderer/browser_plugin/browser_plugin_manager.cc
+++ b/content/renderer/browser_plugin/browser_plugin_manager.cc
@@ -5,7 +5,10 @@
 #include "content/renderer/browser_plugin/browser_plugin_manager.h"
 
 #include "base/lazy_instance.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/threading/thread_local.h"
+#include "base/values.h"
+#include "content/common/browser_plugin/browser_plugin_constants.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/renderer/browser_plugin/browser_plugin.h"
 #include "content/renderer/browser_plugin/browser_plugin_manager_factory.h"
@@ -25,6 +28,7 @@ BrowserPluginManager* BrowserPluginManager::Create(
 
 BrowserPluginManager::BrowserPluginManager(RenderViewImpl* render_view)
     : RenderViewObserver(render_view),
+      current_instance_id_(browser_plugin::kInstanceIDNone),
       render_view_(render_view->AsWeakPtr()) {
 }
 
@@ -32,18 +36,22 @@ BrowserPluginManager::~BrowserPluginManager() {
 }
 
 void BrowserPluginManager::AddBrowserPlugin(
-    int guest_instance_id,
+    int browser_plugin_instance_id,
     BrowserPlugin* browser_plugin) {
-  instances_.AddWithID(browser_plugin, guest_instance_id);
+  instances_.AddWithID(browser_plugin, browser_plugin_instance_id);
 }
 
-void BrowserPluginManager::RemoveBrowserPlugin(int guest_instance_id) {
-  instances_.Remove(guest_instance_id);
+void BrowserPluginManager::RemoveBrowserPlugin(int browser_plugin_instance_id) {
+  instances_.Remove(browser_plugin_instance_id);
 }
 
 BrowserPlugin* BrowserPluginManager::GetBrowserPlugin(
-    int guest_instance_id) const {
-  return instances_.Lookup(guest_instance_id);
+    int browser_plugin_instance_id) const {
+  return instances_.Lookup(browser_plugin_instance_id);
+}
+
+int BrowserPluginManager::GetNextInstanceID() {
+  return ++current_instance_id_;
 }
 
 void BrowserPluginManager::UpdateDeviceScaleFactor(float device_scale_factor) {
@@ -62,4 +70,10 @@ void BrowserPluginManager::UpdateFocusState() {
   }
 }
 
+void BrowserPluginManager::Attach(int browser_plugin_instance_id) {
+  BrowserPlugin* plugin = GetBrowserPlugin(browser_plugin_instance_id);
+  if (plugin)
+    plugin->Attach();
+}
+
 }  // namespace content