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

content/browser/browser_plugin/browser_plugin_embedder.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/browser/browser_plugin/browser_plugin_embedder.h"
 
 #include "base/values.h"
 #include "content/browser/browser_plugin/browser_plugin_guest.h"
 #include "content/browser/browser_plugin/browser_plugin_guest_manager.h"
 #include "content/browser/browser_plugin/browser_plugin_host_factory.h"
@@ skipping 169 matching lines @@
 
   if (guest) {
     // There is an implicit order expectation here:
     // 1. The content embedder is made aware of the attachment.
     // 2. BrowserPluginGuest::Attach is called.
     // 3. The content embedder issues queued events if any that happened
     //    prior to attachment.
     GetContentClient()->browser()->GuestWebContentsAttached(
         guest->GetWebContents(),
         web_contents(),
-        params.browser_plugin_instance_id,
         extra_params);
     guest->Attach(static_cast<WebContentsImpl*>(web_contents()), params);
     return;
   }
 
   scoped_ptr<base::DictionaryValue> copy_extra_params(extra_params.DeepCopy());
   guest = GetBrowserPluginGuestManager()->CreateGuest(
       web_contents()->GetSiteInstance(),
       instance_id, params,
       copy_extra_params.Pass());
   if (guest) {
     GetContentClient()->browser()->GuestWebContentsAttached(
         guest->GetWebContents(),
         web_contents(),
-        params.browser_plugin_instance_id,
         extra_params);
     guest->Initialize(static_cast<WebContentsImpl*>(web_contents()), params);
   }
 }
 
 void BrowserPluginEmbedder::OnPluginAtPositionResponse(
     int instance_id, int request_id, const gfx::Point& position) {
   const std::map<int, WebContents::GetRenderViewHostCallback>::iterator
       callback_iter = pending_get_render_view_callbacks_.find(request_id);
   if (callback_iter == pending_get_render_view_callbacks_.end())
     return;
 
   RenderViewHost* render_view_host;
   BrowserPluginGuest* guest = NULL;
   if (instance_id != browser_plugin::kInstanceIDNone) {
     guest = GetBrowserPluginGuestManager()->GetGuestByInstanceID(
                 instance_id, web_contents()->GetRenderProcessHost()->GetID());
   }
 
   if (guest)
     render_view_host = guest->GetWebContents()->GetRenderViewHost();
   else  // No plugin, use embedder's RenderViewHost.
     render_view_host = web_contents()->GetRenderViewHost();
 
   callback_iter->second.Run(render_view_host, position.x(), position.y());
   pending_get_render_view_callbacks_.erase(callback_iter);
 }
 
 }  // namespace content