Remove BrowserPlugin's -internal-attach method

content/renderer/browser_plugin/browser_plugin_browsertest.cc

 // Copyright (c) 2012 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/browser_plugin/browser_plugin_browsertest.h"
 
 #include "base/debug/leak_annotations.h"
 #include "base/files/file_path.h"
 #include "base/memory/singleton.h"
 #include "base/path_service.h"
@@ skipping 119 matching lines @@
   BrowserPluginHostMsg_Attach_Params params;
   return GetCurrentPluginWithAttachParams(&params);
 }
 
 MockBrowserPlugin* BrowserPluginTest::GetCurrentPluginWithAttachParams(
     BrowserPluginHostMsg_Attach_Params* params) {
   MockBrowserPlugin* browser_plugin = static_cast<MockBrowserPluginManager*>(
       browser_plugin_manager())->last_plugin();
   if (!browser_plugin)
     return NULL;
-  browser_plugin_manager()->AllocateInstanceID(browser_plugin);
+
+  browser_plugin->Attach();
 
   int instance_id = 0;
   const IPC::Message* msg =
       browser_plugin_manager()->sink().GetUniqueMessageMatching(
           BrowserPluginHostMsg_Attach::ID);
   if (!msg)
     return NULL;
 
   PickleIterator iter(*msg);
   if (!iter.ReadInt(&instance_id))
@@ skipping 18 matching lines @@
 
   EXPECT_EQ(640, params.resize_guest_params.view_size.width());
   EXPECT_EQ(480, params.resize_guest_params.view_size.height());
   ASSERT_TRUE(browser_plugin);
 }
 
 TEST_F(BrowserPluginTest, ResizeFlowControl) {
   LoadHTML(GetHTMLForBrowserPluginObject().c_str());
   MockBrowserPlugin* browser_plugin = GetCurrentPlugin();
   ASSERT_TRUE(browser_plugin);
-  int instance_id = browser_plugin->guest_instance_id();
+  int instance_id = browser_plugin->browser_plugin_instance_id();
   // Send an UpdateRect to the BrowserPlugin to make sure the browser sees a
   // resize related (SetAutoSize) message.
   {
     // We send a stale UpdateRect to the BrowserPlugin.
     BrowserPluginMsg_UpdateRect_Params update_rect_params;
     update_rect_params.view_size = gfx::Size(640, 480);
     update_rect_params.scale_factor = 1.0f;
     update_rect_params.is_resize_ack = true;
     BrowserPluginMsg_UpdateRect msg(instance_id, update_rect_params);
     browser_plugin->OnMessageReceived(msg);
@@ skipping 81 matching lines @@
   EXPECT_FALSE(browser_plugin_manager()->sink().GetUniqueMessageMatching(
       BrowserPluginHostMsg_PluginDestroyed::ID));
   ExecuteJavaScript("x = document.getElementById('browserplugin'); "
                     "x.parentNode.removeChild(x);");
   ProcessPendingMessages();
   EXPECT_FALSE(browser_plugin_manager()->sink().GetUniqueMessageMatching(
       BrowserPluginHostMsg_PluginDestroyed::ID));
 }
 
 }  // namespace content