Remove ContentBrowserClient::GuestWebContentsAttached

chrome/browser/guest_view/guest_view_base.cc

 // Copyright 2014 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/guest_view/guest_view_base.h"
 
 #include "base/lazy_instance.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/guest_view/guest_view_constants.h"
 #include "chrome/browser/guest_view/guest_view_manager.h"
@@ skipping 48 matching lines @@
     guest_->EmbedderDestroyed();
     guest_->Destroy();
   }
 
  private:
   GuestViewBase* guest_;
 
   DISALLOW_COPY_AND_ASSIGN(EmbedderWebContentsObserver);
 };
 
-GuestViewBase::GuestViewBase(int guest_instance_id,
-                             WebContents* guest_web_contents,
-                             const std::string& embedder_extension_id)
-    : WebContentsObserver(guest_web_contents),
-      embedder_web_contents_(NULL),
-      embedder_extension_id_(embedder_extension_id),
+GuestViewBase::GuestViewBase(int guest_instance_id)
+    : embedder_web_contents_(NULL),
       embedder_render_process_id_(0),
-      browser_context_(guest_web_contents->GetBrowserContext()),
+      browser_context_(NULL),
       guest_instance_id_(guest_instance_id),
       view_instance_id_(guestview::kInstanceIDNone),
+      initialized_(false),
       weak_ptr_factory_(this) {
+}
+
+void GuestViewBase::Init(WebContents* guest_web_contents,

[lazyboy, 2014/06/13 17:40:01]

Let's add a comment/todo since it's not obvious why this split is required.

[Fady Samuel, 2014/06/16 14:35:40]

Done.

+                         const std::string& embedder_extension_id) {
+  if (initialized_)
+    return;
+  initialized_ = true;
+  browser_context_ = guest_web_contents->GetBrowserContext();
+  embedder_extension_id_ = embedder_extension_id;
+
+  WebContentsObserver::Observe(guest_web_contents);
   guest_web_contents->SetDelegate(this);
   webcontents_guestview_map.Get().insert(
       std::make_pair(guest_web_contents, this));
   GuestViewManager::FromBrowserContext(browser_context_)->
       AddGuest(guest_instance_id_, guest_web_contents);
 }
 
 // static
 GuestViewBase* GuestViewBase::Create(
     int guest_instance_id,
@@ skipping 58 matching lines @@
 }
 
 base::WeakPtr<GuestViewBase> GuestViewBase::AsWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
 }
 
 bool GuestViewBase::IsDragAndDropEnabled() const {
   return false;
 }
 
-void GuestViewBase::Attach(content::WebContents* embedder_web_contents,
-                           const base::DictionaryValue& args) {
+void GuestViewBase::Destroy() {
+  WillDestroy();
+  if (!destruction_callback_.is_null())
+    destruction_callback_.Run();
+  delete guest_web_contents();
+}
+
+void GuestViewBase::DidAttach(content::WebContents* embedder_web_contents,
+                              const base::DictionaryValue& extra_params) {
   embedder_web_contents_ = embedder_web_contents;
   embedder_web_contents_observer_.reset(
       new EmbedderWebContentsObserver(this));
   embedder_render_process_id_ =
       embedder_web_contents->GetRenderProcessHost()->GetID();
-  args.GetInteger(guestview::kParameterInstanceId, &view_instance_id_);
-  extra_params_.reset(args.DeepCopy());
+  extra_params.GetInteger(guestview::kParameterInstanceId, &view_instance_id_);
+  extra_params_.reset(extra_params.DeepCopy());
+
+  // Give the derived class an opportunity to perform some actions.
+  DidAttach();
 
   // GuestViewBase::Attach is called prior to initialization (and initial
   // navigation) of the guest in the content layer in order to permit mapping
   // the necessary associations between the <*view> element and its guest. This
   // is needed by the <webview> WebRequest API to allow intercepting resource
   // requests during navigation. However, queued events should be fired after
   // content layer initialization in order to ensure that load events (such as
   // 'loadstop') fire in embedder after the contentWindow is available.
   if (!in_extension())
     return;
 
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&GuestViewBase::SendQueuedEvents,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
-void GuestViewBase::Destroy() {
-  WillDestroy();
-  if (!destruction_callback_.is_null())
-    destruction_callback_.Run();
-  delete guest_web_contents();
-}
-
-
 void GuestViewBase::SetOpener(GuestViewBase* guest) {
   if (guest && guest->IsViewType(GetViewType())) {
     opener_ = guest->AsWeakPtr();
     return;
   }
   opener_ = base::WeakPtr<GuestViewBase>();
 }
 
 void GuestViewBase::RegisterDestructionCallback(
     const DestructionCallback& callback) {
@@ skipping 70 matching lines @@
 
 void GuestViewBase::SendQueuedEvents() {
   if (!attached())
     return;
   while (!pending_events_.empty()) {
     linked_ptr<Event> event_ptr = pending_events_.front();
     pending_events_.pop_front();
     DispatchEvent(event_ptr.release());
   }
 }