Browser Plugin: Refactor BrowserPluginEmbedder to allow creating guests with openers

content/browser/web_contents/web_contents_impl.cc

Index: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 8fcb09c12c4947362c05f6e3f50025238096d4af..e90b3a9d42fd851ee1ba1be75ee670fc70e61c5d 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -390,10 +390,13 @@ WebContentsImpl* WebContentsImpl::CreateWithOpener(
 WebContentsImpl* WebContentsImpl::CreateGuest(
     BrowserContext* browser_context,
     SiteInstance* site_instance,
+    int routing_id,
+    WebContentsImpl* base_web_contents,
     int guest_instance_id,
     const BrowserPluginHostMsg_CreateGuest_Params& params) {
 
-  WebContentsImpl* new_contents = new WebContentsImpl(browser_context, NULL);
+  WebContentsImpl* new_contents = new WebContentsImpl(browser_context,
+                                                      base_web_contents);
 
   // This makes |new_contents| act as a guest.
   // For more info, see comment above class BrowserPluginGuest.
@@ -403,7 +406,9 @@ WebContentsImpl* WebContentsImpl::CreateGuest(
         new_contents,
         params));
 
-  new_contents->Init(WebContents::CreateParams(browser_context, site_instance));
+  WebContents::CreateParams create_params(browser_context, site_instance);
+  create_params.routing_id = routing_id;
+  new_contents->Init(create_params);
 
   return new_contents;
 }