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

chrome/browser/guestview/webview/webview_guest.cc

 // Copyright 2013 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 "chrome/browser/guestview/webview/webview_guest.h"
 
 #include "chrome/browser/extensions/api/web_request/web_request_api.h"
 #include "chrome/browser/extensions/extension_renderer_state.h"
 #include "chrome/browser/extensions/script_executor.h"
 #include "chrome/browser/guestview/guestview_constants.h"
@@ skipping 62 matching lines @@
 WebViewGuest* WebViewGuest::From(int embedder_process_id,
                                  int guest_instance_id) {
   GuestView* guest = GuestView::From(embedder_process_id, guest_instance_id);
   if (!guest)
     return NULL;
   return guest->AsWebView();
 }
 
 void WebViewGuest::Attach(WebContents* embedder_web_contents,
                           const std::string& extension_id,
-                          int view_instance_id,
                           const base::DictionaryValue& args) {
   GuestView::Attach(
-      embedder_web_contents, extension_id, view_instance_id, args);
+      embedder_web_contents, extension_id, args);
 
   AddWebViewToExtensionRendererState();
 }
 
 GuestView::Type WebViewGuest::GetViewType() const {
   return GuestView::WEBVIEW;
 }
 
 WebViewGuest* WebViewGuest::AsWebView() {
   return this;
@@ skipping 213 matching lines @@
   args->SetBoolean(guestview::kIsTopLevel, is_top_level);
   args->SetString(webview::kNewURL, new_url.spec());
   args->SetString(webview::kOldURL, old_url.spec());
   DispatchEvent(new GuestView::Event(webview::kEventLoadRedirect, args.Pass()));
 }
 
 void WebViewGuest::AddWebViewToExtensionRendererState() {
   ExtensionRendererState::WebViewInfo webview_info;
   webview_info.embedder_process_id = embedder_render_process_id();
   webview_info.embedder_routing_id = embedder_web_contents()->GetRoutingID();
-  webview_info.guest_instance_id = guest_instance_id();
   webview_info.instance_id = view_instance_id();
 
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
       base::Bind(
           &ExtensionRendererState::AddWebView,
           base::Unretained(ExtensionRendererState::GetInstance()),
           guest_web_contents()->GetRenderProcessHost()->GetID(),
           guest_web_contents()->GetRoutingID(),
           webview_info));
 }
 
 // static
 void WebViewGuest::RemoveWebViewFromExtensionRendererState(
     WebContents* web_contents) {
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
       base::Bind(
           &ExtensionRendererState::RemoveWebView,
           base::Unretained(ExtensionRendererState::GetInstance()),
           web_contents->GetRenderProcessHost()->GetID(),
           web_contents->GetRoutingID()));
 }