Move allocate instance id to chrome/.

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/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
@@ skipping 65 matching lines @@
 void BrowserPluginEmbedder::DidSendScreenRects() {
   GetBrowserPluginGuestManager()->ForEachGuest(
           GetWebContents(), base::Bind(
               &BrowserPluginEmbedder::DidSendScreenRectsCallback,
               base::Unretained(this)));
 }
 
 bool BrowserPluginEmbedder::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(BrowserPluginEmbedder, message)
-    IPC_MESSAGE_HANDLER(BrowserPluginHostMsg_AllocateInstanceID,
-                        OnAllocateInstanceID)
     IPC_MESSAGE_HANDLER(BrowserPluginHostMsg_Attach, OnAttach)
     IPC_MESSAGE_HANDLER_GENERIC(DragHostMsg_UpdateDragCursor,
                                 OnUpdateDragCursor(&handled));
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void BrowserPluginEmbedder::DragSourceEndedAt(int client_x, int client_y,
     int screen_x, int screen_y, blink::WebDragOperation operation) {
@@ skipping 12 matching lines @@
   if (guest_started_drag_.get())
     guest_started_drag_->EndSystemDrag();
   guest_started_drag_.reset();
   guest_dragging_over_.reset();
 }
 
 void BrowserPluginEmbedder::OnUpdateDragCursor(bool* handled) {
   *handled = (guest_dragging_over_.get() != NULL);
 }
 
-void BrowserPluginEmbedder::OnAllocateInstanceID(int request_id) {
-  int instance_id = GetBrowserPluginGuestManager()->GetNextInstanceID();
-  Send(new BrowserPluginMsg_AllocateInstanceID_ACK(
-      routing_id(), request_id, instance_id));
-}
-
 void BrowserPluginEmbedder::OnGuestCallback(
     int instance_id,
     const BrowserPluginHostMsg_Attach_Params& params,
     const base::DictionaryValue* extra_params,
     WebContents* guest_web_contents) {
   BrowserPluginGuest* guest = guest_web_contents ?
       static_cast<WebContentsImpl*>(guest_web_contents)->
           GetBrowserPluginGuest() : NULL;
+  if (!guest) {
+    scoped_ptr<base::DictionaryValue> copy_extra_params(
+        extra_params->DeepCopy());
+    guest_web_contents = GetBrowserPluginGuestManager()->CreateGuest(
+        GetWebContents()->GetSiteInstance(),
+        instance_id,
+        copy_extra_params.Pass());
+    guest = guest_web_contents
+                ? static_cast<WebContentsImpl*>(guest_web_contents)
+                      ->GetBrowserPluginGuest()
+                : NULL;
+  }
+
   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(),
         GetWebContents(),
         *extra_params);
     guest->Attach(GetWebContents(), params, *extra_params);
-    return;
-  }
-
-  scoped_ptr<base::DictionaryValue> copy_extra_params(extra_params->DeepCopy());
-  guest_web_contents = GetBrowserPluginGuestManager()->CreateGuest(
-      GetWebContents()->GetSiteInstance(),
-      instance_id,
-      params.storage_partition_id,
-      params.persist_storage,
-      copy_extra_params.Pass());
-  guest = guest_web_contents ?
-      static_cast<WebContentsImpl*>(guest_web_contents)->
-          GetBrowserPluginGuest() : NULL;
-  if (guest) {
-    GetContentClient()->browser()->GuestWebContentsAttached(
-        guest->GetWebContents(),
-        GetWebContents(),
-        *extra_params);
-    guest->Initialize(params, GetWebContents());
   }
 }
 
 void BrowserPluginEmbedder::OnAttach(
     int instance_id,
     const BrowserPluginHostMsg_Attach_Params& params,
     const base::DictionaryValue& extra_params) {
   GetBrowserPluginGuestManager()->MaybeGetGuestByInstanceIDOrKill(
       instance_id, GetWebContents()->GetRenderProcessHost()->GetID(),
       base::Bind(&BrowserPluginEmbedder::OnGuestCallback,
                  base::Unretained(this),
                  instance_id,
                  params,
                  &extra_params));
 }
 
 }  // namespace content