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

chrome/renderer/extensions/dispatcher.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_RENDERER_EXTENSIONS_DISPATCHER_H_
 #define CHROME_RENDERER_EXTENSIONS_DISPATCHER_H_
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/shared_memory.h"
 #include "base/timer.h"
 #include "content/public/renderer/render_process_observer.h"
 #include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/extensions/features/feature.h"
 #include "chrome/renderer/extensions/chrome_v8_context.h"
 #include "chrome/renderer/extensions/chrome_v8_context_set.h"
 #include "chrome/renderer/extensions/v8_schema_registry.h"
 #include "chrome/renderer/resource_bundle_source_map.h"
 #include "extensions/common/event_filter.h"
 #include "v8/include/v8.h"
 
 class GURL;
 class ModuleSystem;
 class URLPattern;
+struct ExtensionMsg_ExternalConnectionInfo;
 struct ExtensionMsg_Loaded_Params;
 
 namespace WebKit {
 class WebFrame;
 }
 
 namespace base {
+class DictionaryValue;
 class ListValue;
 }
 
 namespace content {
 class RenderThread;
 }
 
 namespace extensions {
 class ContentWatcher;
 class Extension;
@@ skipping 94 matching lines @@
   virtual void IdleNotification() OVERRIDE;
 
   void OnSetChannel(int channel);
   void OnMessageInvoke(const std::string& extension_id,
                        const std::string& function_name,
                        const base::ListValue& args,
                        const GURL& event_url,
                        bool user_gesture);
   void OnDispatchOnConnect(int target_port_id,
                            const std::string& channel_name,
-                           const std::string& tab_json,
-                           const std::string& source_extension_id,
-                           const std::string& target_extension_id);
+                           const base::DictionaryValue& source_tab,
+                           const ExtensionMsg_ExternalConnectionInfo& info);
   void OnDeliverMessage(int target_port_id, const std::string& message);
   void OnDispatchOnDisconnect(int port_id, const std::string& error_message);
   void OnSetFunctionNames(const std::vector<std::string>& names);
   void OnLoaded(
       const std::vector<ExtensionMsg_Loaded_Params>& loaded_extensions);
   void OnUnloaded(const std::string& id);
   void OnSetScriptingWhitelist(
       const Extension::ScriptingWhitelist& extension_ids);
   void OnPageActionsUpdated(const std::string& extension_id,
       const std::vector<std::string>& page_actions);
@@ skipping 107 matching lines @@
 
   // Sends API requests to the extension host.
   scoped_ptr<RequestSender> request_sender_;
 
   DISALLOW_COPY_AND_ASSIGN(Dispatcher);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_RENDERER_EXTENSIONS_DISPATCHER_H_