<webview>: Allocate the view instance ID from the WebView shim

content/renderer/browser_plugin/browser_plugin_manager_impl.cc

Index: content/renderer/browser_plugin/browser_plugin_manager_impl.cc
diff --git a/content/renderer/browser_plugin/browser_plugin_manager_impl.cc b/content/renderer/browser_plugin/browser_plugin_manager_impl.cc
index 15c29a6ba70e6bb09683e1d6562da274b3c8b0da..2f7cdac462010b372ec84c7b39b7942183890d91 100644
--- a/content/renderer/browser_plugin/browser_plugin_manager_impl.cc
+++ b/content/renderer/browser_plugin/browser_plugin_manager_impl.cc
@@ -16,7 +16,7 @@ namespace content {
 BrowserPluginManagerImpl::BrowserPluginManagerImpl(
     RenderViewImpl* render_view)
     : BrowserPluginManager(render_view),
-      browser_plugin_instance_id_counter_(0) {
+      request_id_counter_(0) {
 }
 
 BrowserPluginManagerImpl::~BrowserPluginManagerImpl() {
@@ -26,17 +26,16 @@ BrowserPlugin* BrowserPluginManagerImpl::CreateBrowserPlugin(
     RenderViewImpl* render_view,
     WebKit::WebFrame* frame,
     const WebKit::WebPluginParams& params) {
-  return new BrowserPlugin(render_view, frame, params,
-      ++browser_plugin_instance_id_counter_);
+  return new BrowserPlugin(render_view, frame, params);
 }
 
 void BrowserPluginManagerImpl::AllocateInstanceID(
     BrowserPlugin* browser_plugin) {
-  int instance_id = browser_plugin->instance_id();
+  int request_id = ++request_id_counter_;
   pending_allocate_guest_instance_id_requests_.AddWithID(browser_plugin,
-                                                         instance_id);
+                                                         request_id);
   Send(new BrowserPluginHostMsg_AllocateInstanceID(
-      browser_plugin->render_view_routing_id(), instance_id));
+      browser_plugin->render_view_routing_id(), request_id));
 }
 
 bool BrowserPluginManagerImpl::Send(IPC::Message* msg) {
@@ -78,15 +77,13 @@ void BrowserPluginManagerImpl::DidCommitCompositorFrame() {
 
 void BrowserPluginManagerImpl::OnAllocateInstanceIDACK(
     const IPC::Message& message,
-    int browser_plugin_instance_id,
+    int request_id,
     int guest_instance_id) {
   BrowserPlugin* plugin =
-    pending_allocate_guest_instance_id_requests_.Lookup(
-          browser_plugin_instance_id);
+    pending_allocate_guest_instance_id_requests_.Lookup(request_id);
   if (!plugin)
     return;
-  pending_allocate_guest_instance_id_requests_.Remove(
-      browser_plugin_instance_id);
+  pending_allocate_guest_instance_id_requests_.Remove(request_id);
   plugin->OnInstanceIDAllocated(guest_instance_id);
 }