Fix a couple of bugs relating to sending Tab info with chrome.runtime.connect and

chrome/browser/extensions/api/messaging/message_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_MESSAGING_MESSAGE_SERVICE_H_
 #define CHROME_BROWSER_EXTENSIONS_API_MESSAGING_MESSAGE_SERVICE_H_
 
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/extensions/api/messaging/native_message_process_host.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
+class GURL;
 class Profile;
 
+namespace base {
+class DictionaryValue;
+}
+
 namespace content {
 class RenderProcessHost;
 class WebContents;
 }
 
 namespace extensions {
+class Extension;
 class ExtensionHost;
 class LazyBackgroundTaskQueue;
 
 // This class manages message and event passing between renderer processes.
 // It maintains a list of processes that are listening to events and a set of
 // open channels.
 //
 // Messaging works this way:
 // - An extension-owned script context (like a background page or a content
 //   script) adds an event listener to the "onConnect" event.
@@ skipping 19 matching lines @@
   // example).
   struct MessageChannel;
 
   // One side of the communication handled by extensions::MessageService.
   class MessagePort {
    public:
     virtual ~MessagePort() {}
     // Notify the port that the channel has been opened.
     virtual void DispatchOnConnect(int dest_port_id,
                                    const std::string& channel_name,
-                                   const std::string& tab_json,
+                                   const base::DictionaryValue& source_tab,
                                    const std::string& source_extension_id,
-                                   const std::string& target_extension_id) {}
+                                   const std::string& target_extension_id,
+                                   const GURL& source_url) {}
 
     // Notify the port that the channel has been closed. If |error_message| is
     // non-empty, it indicates an error occurred while opening the connection.
     virtual void DispatchOnDisconnect(int source_port_id,
                                       const std::string& error_message) {}
 
     // Dispatch a message to this end of the communication.
     virtual void DispatchOnMessage(const std::string& message,
                                    int target_port_id) = 0;
 
@@ skipping 19 matching lines @@
   explicit MessageService(LazyBackgroundTaskQueue* queue);
   virtual ~MessageService();
 
   // Given an extension's ID, opens a channel between the given renderer "port"
   // and every listening context owned by that extension. |channel_name| is
   // an optional identifier for use by extension developers.
   void OpenChannelToExtension(
       int source_process_id, int source_routing_id, int receiver_port_id,
       const std::string& source_extension_id,
       const std::string& target_extension_id,
+      const GURL& source_url,
       const std::string& channel_name);
 
   // Same as above, but opens a channel to the tab with the given ID.  Messages
   // are restricted to that tab, so if there are multiple tabs in that process,
   // only the targeted tab will receive messages.
   void OpenChannelToTab(
       int source_process_id, int source_routing_id, int receiver_port_id,
       int tab_id, const std::string& extension_id,
       const std::string& channel_name);
 
@@ skipping 47 matching lines @@
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // A process that might be in our list of channels has closed.
   void OnProcessClosed(content::RenderProcessHost* process);
 
   // Potentially registers a pending task with the LazyBackgroundTaskQueue
   // to open a channel. Returns true if a task was queued.
   // Takes ownership of |params| if true is returned.
   bool MaybeAddPendingOpenChannelTask(Profile* profile,
+                                      const Extension* extension,
                                       OpenChannelParams* params);
 
   // Callbacks for LazyBackgroundTaskQueue tasks. The queue passes in an
   // ExtensionHost to its task callbacks, though some of our callbacks don't
   // use that argument.
   void PendingOpenChannel(scoped_ptr<OpenChannelParams> params,
                           int source_process_id,
                           extensions::ExtensionHost* host);
   void PendingCloseChannel(int port_id,
                            const std::string& error_message,
@@ skipping 16 matching lines @@
   LazyBackgroundTaskQueue* lazy_background_task_queue_;
 
   base::WeakPtrFactory<MessageService> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MessageService);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_MESSAGING_MESSAGE_SERVICE_H_