Add a public content/ interface for intents. Use it.

content/browser/intents/intent_injector.cc

 // Copyright (c) 2011 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/command_line.h"
 #include "base/logging.h"
 #include "base/string16.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/intents_messages.h"
 #include "content/public/common/content_switches.h"
 #include "webkit/glue/web_intent_data.h"
 #include "webkit/glue/web_intent_reply_data.h"
 
 IntentInjector::IntentInjector(TabContents* tab_contents)
     : TabContentsObserver(tab_contents),
+      source_tab_(NULL),
       intent_id_(0) {
   DCHECK(tab_contents);
 }
 
 IntentInjector::~IntentInjector() {
 }
 
 void IntentInjector::TabContentsDestroyed(TabContents* tab) {
-  if (source_tab_.get() != NULL) {
-    scoped_ptr<IPC::Message::Sender> sender;
-    sender.swap(source_tab_);
-    sender->Send(new IntentsMsg_WebIntentReply(
+  if (source_tab_) {
+    source_tab_->Send(new IntentsMsg_WebIntentReply(
         0, webkit_glue::WEB_INTENT_SERVICE_TAB_CLOSED, string16(), intent_id_));
   }
 
   delete this;
 }
 
 void IntentInjector::SourceTabContentsDestroyed(TabContents* tab) {
-  source_tab_.reset(NULL);
+  source_tab_ = NULL;
 }
 
 void IntentInjector::SetIntent(IPC::Message::Sender* source_tab,
                                const webkit_glue::WebIntentData& intent,
                                int intent_id) {
-  source_tab_.reset(source_tab);
+  source_tab_ = source_tab;
   source_intent_.reset(new webkit_glue::WebIntentData(intent));
   intent_id_ = intent_id;
 
   SendIntent();
 }
 
 void IntentInjector::RenderViewCreated(RenderViewHost* host) {
   SendIntent();
 }
 
@@ skipping 34 matching lines @@
   return handled;
 }
 
 void IntentInjector::OnReply(const IPC::Message& message,
                              webkit_glue::WebIntentReplyType reply_type,
                              const string16& data,
                              int intent_id) {
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableWebIntents))
     NOTREACHED();
 
-  if (source_tab_.get() != NULL) {
-    // Swap before use since sending this message may cause
-    // TabContentsDestroyed to be called.
-    scoped_ptr<IPC::Message::Sender> sender;
-    sender.swap(source_tab_);
-    sender->Send(new IntentsMsg_WebIntentReply(
+  if (source_tab_) {
+    source_tab_->Send(new IntentsMsg_WebIntentReply(
         0, reply_type, data, intent_id));
   }
 }