GuestView: Use Weak Pointers Throughout

extensions/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 "extensions/browser/guest_view/guest_view_base.h"
 
 #include "base/lazy_instance.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
@@ skipping 139 matching lines @@
     delete this;
     callback.Run(NULL);
     return;
   }
 
   CreateWebContents(embedder_extension_id,
                     embedder_process_id,
                     embedder_site_url,
                     create_params,
                     base::Bind(&GuestViewBase::CompleteInit,
-                               AsWeakPtr(),
+                               weak_ptr_factory_.GetWeakPtr(),
                                embedder_extension_id,
                                embedder_process_id,
                                callback));
 }
 
 void GuestViewBase::InitWithWebContents(
     const std::string& embedder_extension_id,
     int embedder_render_process_id,
     content::WebContents* guest_web_contents) {
   DCHECK(guest_web_contents);
@@ skipping 92 matching lines @@
     return NULL;
 
   return GuestViewBase::FromWebContents(guest_web_contents);
 }
 
 // static
 bool GuestViewBase::IsGuest(WebContents* web_contents) {
   return !!GuestViewBase::FromWebContents(web_contents);
 }
 
-base::WeakPtr<GuestViewBase> GuestViewBase::AsWeakPtr() {
-  return weak_ptr_factory_.GetWeakPtr();
-}
-
 bool GuestViewBase::IsAutoSizeSupported() const {
   return false;
 }
 
 bool GuestViewBase::IsDragAndDropEnabled() const {
   return false;
 }
 
 void GuestViewBase::RenderProcessExited(content::RenderProcessHost* host,
                                         base::ProcessHandle handle,
@@ skipping 33 matching lines @@
 void GuestViewBase::GuestSizeChanged(const gfx::Size& old_size,
                                      const gfx::Size& new_size) {
   if (!auto_size_enabled_)
     return;
   guest_size_ = new_size;
   GuestSizeChangedDueToAutoSize(old_size, new_size);
 }
 
 void GuestViewBase::Destroy() {
   DCHECK(web_contents());
+
   content::RenderProcessHost* host =
       content::RenderProcessHost::FromID(embedder_render_process_id());
   if (host)
     host->RemoveObserver(this);
 
   // Give the derived class an opportunity to perform some cleanup.
   WillDestroy();
 
+  // Invalidate weak pointers now so that bound callbacks cannot be called late
+  // into destruction. We must call this after WillDestroy because derived types
+  // may wish to access their openers.
+  weak_ptr_factory_.InvalidateWeakPtrs();
+
   // Give the content module an opportunity to perform some cleanup.
   if (!destruction_callback_.is_null())
     destruction_callback_.Run();
 
   webcontents_guestview_map.Get().erase(web_contents());
   GuestViewManager::FromBrowserContext(browser_context_)->
       RemoveGuest(guest_instance_id_);
   pending_events_.clear();
 
   delete web_contents();
 }
 
 void GuestViewBase::SetAttachParams(const base::DictionaryValue& params) {
   attach_params_.reset(params.DeepCopy());
   attach_params_->GetInteger(guestview::kParameterInstanceId,
                              &view_instance_id_);
 }
 
 void GuestViewBase::SetOpener(GuestViewBase* guest) {
   if (guest && guest->IsViewType(GetViewType())) {
-    opener_ = guest->AsWeakPtr();
+    opener_ = guest->weak_ptr_factory_.GetWeakPtr();
     return;
   }
   opener_ = base::WeakPtr<GuestViewBase>();
 }
 
 void GuestViewBase::RegisterDestructionCallback(
     const DestructionCallback& callback) {
   destruction_callback_ = callback;
 }
 
@@ skipping 135 matching lines @@
 
 // static
 void GuestViewBase::RegisterGuestViewTypes() {
   AppViewGuest::Register();
   ExtensionOptionsGuest::Register();
   MimeHandlerViewGuest::Register();
   WebViewGuest::Register();
 }
 
 }  // namespace extensions