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

content/browser/intents/intent_injector.h

 // 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.
 
 #ifndef CONTENT_BROWSER_INTENTS_INTENT_INJECTOR_H_
 #define CONTENT_BROWSER_INTENTS_INTENT_INJECTOR_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/string16.h"
@@ skipping 22 matching lines @@
       const content::LoadCommittedDetails& details,
       const content::FrameNavigateParams& params) OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void TabContentsDestroyed(TabContents* tab) OVERRIDE;
 
   // Used to notify the object that the source tab has been destroyed.
   virtual void SourceTabContentsDestroyed(TabContents* tab);
 
   // Sets the intent data to be injected. Call after the user has selected a
   // service to pass the intent data to that service.
-  // |source_tab| is a sender to use to communicate to the source tab. Takes
-  // ownership of |source_tab|.
+  // |source_tab| is a sender to use to communicate to the source tab. The
+  // caller must ensure that SourceTabContentsDestroyed is called when this
+  // object becomes unusable.
   // |intent| is the intent data from the source
   // |intent_id| is the ID assigned to the intent invocation from the source
   // context.
   void SetIntent(IPC::Message::Sender* source_tab,
                  const webkit_glue::WebIntentData& intent,
                  int intent_id);
 
  private:
   // Delivers the intent data to the renderer.
   void SendIntent();
 
   // Handles receiving a reply from the intent delivery page.
   void OnReply(const IPC::Message& message,
                webkit_glue::WebIntentReplyType reply_type,
                const string16& data,
                int intent_id);
 
   // Source intent data provided by caller.
   scoped_ptr<webkit_glue::WebIntentData> source_intent_;
 
-  // Message forwarder to the tab invoking the intent.
-  scoped_ptr<IPC::Message::Sender> source_tab_;
+  // Weak pointer to the message forwarder to the tab invoking the intent.
+  IPC::Message::Sender* source_tab_;
 
   // Unique ID assigned to the intent by the source tab.
   int intent_id_;
 
   DISALLOW_COPY_AND_ASSIGN(IntentInjector);
 };
 
 #endif  // CONTENT_BROWSER_INTENTS_INTENT_INJECTOR_H_