Use FrameTreeNode ID as frameId in extension APIs

chrome/browser/renderer_host/chrome_extension_message_filter.h

Index: chrome/browser/renderer_host/chrome_extension_message_filter.h
diff --git a/chrome/browser/renderer_host/chrome_extension_message_filter.h b/chrome/browser/renderer_host/chrome_extension_message_filter.h
index 04762a9f90a0982077f8619acb284d6ab9708dcd..50b958e1d2bd8171ca7eff1ce2e23126be50120c 100644
--- a/chrome/browser/renderer_host/chrome_extension_message_filter.h
+++ b/chrome/browser/renderer_host/chrome_extension_message_filter.h
@@ -72,23 +72,26 @@ class ChromeExtensionMessageFilter : public content::BrowserMessageFilter,
                                         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);