Fix some issues with extension messaging:

chrome/browser/extensions/extension_message_service.h

 // Copyright (c) 2009 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_EXTENSION_MESSAGE_SERVICE_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_MESSAGE_SERVICE_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 122 matching lines @@
 
   // --- UI thread only:
 
   // UI-thread specific initialization.  Does nothing if called more than once.
   void Init();
 
   // Handles channel creation and notifies the destination that a channel was
   // opened.
   void OpenChannelOnUIThread(int source_routing_id,
       int source_port_id, int source_process_id,
-      int dest_port_id, int dest_process_id);
+      int dest_port_id, int dest_process_id,
+      const std::string& extension_id);
 
   // Common between OpenChannelOnUIThread and
   // OpenAutomationChannelToExtension.
   void OpenChannelOnUIThreadImpl(
-    int source_routing_id, int source_port_id, IPC::Message::Sender* source,
-    int dest_port_id, int dest_process_id, int source_process_id);
+    int source_routing_id, int source_port_id, int source_process_id,
+    IPC::Message::Sender* source, int dest_port_id, int dest_process_id,
+    const std::string& extension_id);
 
   MessageChannelMap channels_;
 
   // True if Init has been called.
   bool initialized_;
 
   // For generating unique channel IDs.
   int next_port_id_;
 
   // Protects the next_port_id_ variable, since it can be
   // used on the IO thread or the UI thread.
   Lock next_port_id_lock_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionMessageService);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_MESSAGE_SERVICE_H_