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

chrome/renderer/chrome_mock_render_thread.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 CHROME_RENDERER_CHROME_MOCK_RENDER_THREAD_H_
 #define CHROME_RENDERER_CHROME_MOCK_RENDER_THREAD_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "content/public/test/mock_render_thread.h"
 
 namespace base {
 class DictionaryValue;
 }
 
 class MockPrinter;
+struct ExtensionMsg_ExternalConnectionInfo;
 struct PrintHostMsg_DidGetPreviewPageCount_Params;
 struct PrintHostMsg_DidPreviewPage_Params;
 struct PrintHostMsg_DidPrintPage_Params;
 struct PrintHostMsg_ScriptedPrint_Params;
 struct PrintMsg_PrintPages_Params;
 struct PrintMsg_Print_Params;
 
 // Extends content::MockRenderThread to know about printing and
 // extension messages.
 class ChromeMockRenderThread : public content::MockRenderThread {
@@ skipping 17 matching lines @@
   // Get the number of pages to generate for print preview.
   int print_preview_pages_remaining() const;
 
  private:
   // Overrides base class implementation to add custom handling for
   // print and extensions.
   virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
 
   // The callee expects to be returned a valid channel_id.
   void OnOpenChannelToExtension(int routing_id,
-                                const std::string& extension_id,
-                                const std::string& source_extension_id,
-                                const std::string& target_extension_id,
+                                const ExtensionMsg_ExternalConnectionInfo& info,
+                                const std::string& channel_name,
                                 int* port_id);
 
 #if defined(OS_CHROMEOS)
   void OnAllocateTempFileForPrinting(base::FileDescriptor* renderer_fd,
                                      int* browser_fd);
   void OnTempFileForPrintingWritten(int render_view_id, int browser_fd);
 #endif
 
   // PrintWebViewHelper expects default print settings.
   void OnGetDefaultPrintSettings(PrintMsg_Print_Params* setting);
@@ skipping 25 matching lines @@
 
   // Simulates cancelling print preview if |print_preview_pages_remaining_|
   // equals this.
   int print_preview_cancel_page_number_;
 
   // Number of pages to generate for print preview.
   int print_preview_pages_remaining_;
 };
 
 #endif  // CHROME_RENDERER_CHROME_MOCK_RENDER_THREAD_H_