Remove GuestWebContentsCreated

content/browser/browser_plugin/browser_plugin_guest.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_guest.h"
 
 #include <algorithm>
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 97 matching lines @@
 
   return embedder_web_contents()->GotResponseToLockMouseRequest(allowed);
 }
 
 void BrowserPluginGuest::Destroy() {
   if (!delegate_)
     return;
   delegate_->Destroy();
 }
 
+WebContentsImpl* BrowserPluginGuest::CreateNewGuestWindow(
+    WebContents::CreateParams* params) {
+  if (!delegate_)

[lazyboy, 2014/06/17 23:46:46]

This would pretty much result in null pointer exception, we need to CHECK/DCHECK

[Fady Samuel, 2014/06/18 21:08:34]

I've made delegate a part of the constructor. Now we can assume delegates always
exist. I added a DCHECK to the constructor. With this patch
BrowserPluginGuestDelegate outlives BrowserPluginGuest too so we can always
assume delegate_ is safe to access.

[lazyboy, 2014/06/19 16:17:31]

That's great.
Can you also update your CL description to reflect this?

[Fady Samuel, 2014/06/20 15:16:35]

Done.

+    return NULL;
+  return static_cast<WebContentsImpl*>(delegate_->CreateNewGuestWindow(params));
+}
+
 bool BrowserPluginGuest::OnMessageReceivedFromEmbedder(
     const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(BrowserPluginGuest, message)
     IPC_MESSAGE_HANDLER(BrowserPluginHostMsg_CompositorFrameSwappedACK,
                         OnCompositorFrameSwappedACK)
     IPC_MESSAGE_HANDLER(BrowserPluginHostMsg_CopyFromCompositingSurfaceAck,
                         OnCopyFromCompositingSurfaceAck)
     IPC_MESSAGE_HANDLER(BrowserPluginHostMsg_DragStatusUpdate,
                         OnDragStatusUpdate)
@@ skipping 104 matching lines @@
     has_render_view_ = true;
   }
 }
 
 BrowserPluginGuest::~BrowserPluginGuest() {
 }
 
 // static
 BrowserPluginGuest* BrowserPluginGuest::Create(
     int instance_id,
-    SiteInstance* guest_site_instance,
     WebContentsImpl* web_contents,
-    scoped_ptr<base::DictionaryValue> extra_params,
-    BrowserPluginGuest* opener) {
+    BrowserPluginGuestDelegate* delegate) {
   RecordAction(base::UserMetricsAction("BrowserPlugin.Guest.Create"));
   BrowserPluginGuest* guest = new BrowserPluginGuest(
       instance_id, web_contents->opener() != NULL, web_contents);
   web_contents->SetBrowserPluginGuest(guest);
-  WebContents* opener_web_contents = NULL;
-  if (opener) {
-    opener_web_contents = opener->GetWebContents();
-    guest_site_instance = opener_web_contents->GetSiteInstance();
-  }
-  BrowserPluginGuestDelegate* delegate = NULL;
-  GetContentClient()->browser()->GuestWebContentsCreated(
-      instance_id,
-      guest_site_instance,
-      web_contents,
-      opener_web_contents,
-      &delegate,
-      extra_params.Pass());
   if (delegate) {
     delegate->RegisterDestructionCallback(
         base::Bind(&BrowserPluginGuest::WillDestroy,
                    base::Unretained(guest)));
     guest->set_delegate(delegate);
   }
   return guest;
 }
 
 // static
@@ skipping 621 matching lines @@
 void BrowserPluginGuest::OnImeCompositionRangeChanged(
       const gfx::Range& range,
       const std::vector<gfx::Rect>& character_bounds) {
   static_cast<RenderWidgetHostViewBase*>(
       web_contents()->GetRenderWidgetHostView())->ImeCompositionRangeChanged(
           range, character_bounds);
 }
 #endif
 
 }  // namespace content