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

chrome/renderer/extensions/extension_helper.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_EXTENSION_HELPER_H_
 #define CHROME_RENDERER_EXTENSIONS_EXTENSION_HELPER_H_
 
 #include <map>
 #include <vector>
 
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/common/console_message_level.h"
 #include "content/public/renderer/render_view_observer.h"
 #include "content/public/renderer/render_view_observer_tracker.h"
 #include "extensions/common/view_type.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h"
 
 class GURL;
 class SkBitmap;
 struct ExtensionMsg_ExecuteCode_Params;
+struct ExtensionMsg_ExternalConnectionInfo;
 struct WebApplicationInfo;
 
 namespace base {
+class DictionaryValue;
 class ListValue;
 }
 
 namespace webkit_glue {
 class ResourceFetcher;
 class ImageResourceFetcher;
 }
 
 namespace extensions {
 class Dispatcher;
@@ skipping 36 matching lines @@
   virtual void DraggableRegionsChanged(WebKit::WebFrame* frame) OVERRIDE;
 
   void OnExtensionResponse(int request_id, bool success,
                            const base::ListValue& response,
                            const std::string& error);
   void OnExtensionMessageInvoke(const std::string& extension_id,
                                 const std::string& function_name,
                                 const base::ListValue& args,
                                 const GURL& event_url,
                                 bool user_gesture);
-  void OnExtensionDispatchOnConnect(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);
+  void OnExtensionDispatchOnConnect(
+      int target_port_id,
+      const std::string& channel_name,
+      const base::DictionaryValue& source_tab,
+      const ExtensionMsg_ExternalConnectionInfo& info);
   void OnExtensionDeliverMessage(int target_port_id,
                                  const std::string& message);
   void OnExtensionDispatchOnDisconnect(int port_id,
                                        const std::string& error_message);
   void OnExecuteCode(const ExtensionMsg_ExecuteCode_Params& params);
   void OnGetApplicationInfo(int page_id);
   void OnNotifyRendererViewType(ViewType view_type);
   void OnSetTabId(int tab_id);
   void OnUpdateBrowserWindowId(int window_id);
   void OnAddMessageToConsole(content::ConsoleMessageLevel level,
@@ skipping 27 matching lines @@
 
   // Id number of browser window which RenderView is attached to.
   int browser_window_id_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionHelper);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_RENDERER_EXTENSIONS_EXTENSION_HELPER_H_