Allow severing connection between dispatcher and injector

content/browser/intents/intent_injector.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/intents/intent_injector.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/string16.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/intents_messages.h"
 #include "content/public/browser/web_intents_dispatcher.h"
 #include "content/public/common/content_switches.h"
 #include "webkit/glue/web_intent_data.h"
 #include "webkit/glue/web_intent_reply_data.h"
 
 using content::RenderViewHost;
 using content::WebContents;
 
 IntentInjector::IntentInjector(WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
-      intents_dispatcher_(NULL) {
+      intents_dispatcher_(NULL),
+      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
   DCHECK(web_contents);
 }
 
 IntentInjector::~IntentInjector() {
 }
 
 void IntentInjector::WebContentsDestroyed(content::WebContents* contents) {
   if (intents_dispatcher_) {
     intents_dispatcher_->SendReplyMessage(
         webkit_glue::WEB_INTENT_SERVICE_CONTENTS_CLOSED, string16());
   }
 
   delete this;
 }
 
 void IntentInjector::SourceWebContentsDestroyed(WebContents* contents) {
   intents_dispatcher_ = NULL;
 }
 
 void IntentInjector::SetIntent(
     content::WebIntentsDispatcher* intents_dispatcher,
     const webkit_glue::WebIntentData& intent) {
   intents_dispatcher_ = intents_dispatcher;
   intents_dispatcher_->RegisterReplyNotification(
-      base::Bind(&IntentInjector::OnSendReturnMessage, base::Unretained(this)));
+      base::Bind(&IntentInjector::OnSendReturnMessage,
+                 weak_factory_.GetWeakPtr()));
   source_intent_.reset(new webkit_glue::WebIntentData(intent));
   initial_url_ = web_contents()->GetPendingSiteInstance()->GetSite();
 }
 
+void IntentInjector::Abandon() {
+  intents_dispatcher_ = NULL;
+  delete this;
+}
+
 void IntentInjector::OnSendReturnMessage(
     webkit_glue::WebIntentReplyType reply_type) {
   intents_dispatcher_ = NULL;
 }
 
 void IntentInjector::RenderViewCreated(RenderViewHost* render_view_host) {
   if (source_intent_.get() == NULL ||
       CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableWebIntents) ||
       web_contents()->GetRenderViewHost() == NULL) {
@@ skipping 32 matching lines @@
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableWebIntents))
     NOTREACHED();
 
   if (intents_dispatcher_) {
     // Ensure we only call SendReplyMessage once.
     content::WebIntentsDispatcher* intents_dispatcher = intents_dispatcher_;
     intents_dispatcher_ = NULL;
     intents_dispatcher->SendReplyMessage(reply_type, data);
   }
 }