Use FrameTreeNode ID as frameId in extension APIs

chrome/browser/renderer_host/chrome_extension_message_filter.h

 // Copyright 2014 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_RENDERER_HOST_CHROME_EXTENSION_MESSAGE_FILTER_H_
 #define CHROME_BROWSER_RENDERER_HOST_CHROME_EXTENSION_MESSAGE_FILTER_H_
 
 #include <string>
 
 #include "base/sequenced_task_runner_helpers.h"
@@ skipping 53 matching lines @@
       const std::string& channel_name,
       bool include_tls_channel_id);
   void OnOpenChannelToNativeApp(int routing_id,
                                 const std::string& source_extension_id,
                                 const std::string& native_app_name,
                                 int* port_id);
   void OpenChannelToNativeAppOnUIThread(int source_routing_id,
                                         int receiver_port_id,
                                         const std::string& source_extension_id,
                                         const std::string& native_app_name);
-  void OnOpenChannelToTab(const ExtensionMsg_TabTargetConnectionInfo& info,
+  void OnOpenChannelToTab(int routing_id,
+                          const ExtensionMsg_TabTargetConnectionInfo& info,
                           const std::string& extension_id,
                           const std::string& channel_name,
                           int* port_id);
   void OpenChannelToTabOnUIThread(
       int source_process_id,
+      int source_routing_id,
       int receiver_port_id,
       const ExtensionMsg_TabTargetConnectionInfo& info,
       const std::string& extension_id,
       const std::string& channel_name);
+  void OnOpenMessagePort(int routing_id, int port_id);
+  void OnCloseMessagePort(int routing_id, int port_id, bool force_close);
   void OnPostMessage(int port_id, const extensions::Message& message);
   void OnGetExtMessageBundle(const std::string& extension_id,
                              IPC::Message* reply_msg);
   void OnGetExtMessageBundleOnBlockingPool(
       const std::string& extension_id,
       IPC::Message* reply_msg);
-  void OnExtensionCloseChannel(int port_id, const std::string& error_message);
   void OnAddAPIActionToExtensionActivityLog(
       const std::string& extension_id,
       const ExtensionHostMsg_APIActionOrEvent_Params& params);
   void OnAddBlockedCallToExtensionActivityLog(
       const std::string& extension_id,
       const std::string& function_name);
   void OnAddDOMActionToExtensionActivityLog(
       const std::string& extension_id,
       const ExtensionHostMsg_DOMAction_Params& params);
   void OnAddEventToExtensionActivityLog(
@@ skipping 14 matching lines @@
   Profile* profile_;
 
   scoped_refptr<extensions::InfoMap> extension_info_map_;
 
   content::NotificationRegistrar notification_registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeExtensionMessageFilter);
 };
 
 #endif  // CHROME_BROWSER_RENDERER_HOST_CHROME_EXTENSION_MESSAGE_FILTER_H_