[Extensions] Extension Port Ids and Initialization 2.0

extensions/renderer/extension_frame_helper.h

 // Copyright 2013 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 EXTENSIONS_RENDERER_EXTENSION_FRAME_HELPER_H_
 #define EXTENSIONS_RENDERER_EXTENSION_FRAME_HELPER_H_
 
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "content/public/common/console_message_level.h"
 #include "content/public/renderer/render_frame_observer.h"
 #include "content/public/renderer/render_frame_observer_tracker.h"
 #include "extensions/common/view_type.h"
 
 struct ExtensionMsg_ExternalConnectionInfo;
 struct ExtensionMsg_TabConnectionInfo;
-struct ExtensionMsg_TabTargetConnectionInfo;
 
 namespace base {
 class ListValue;
 }
 
 namespace extensions {
 
 class Dispatcher;
 struct Message;
+struct PortId;
 class ScriptContext;
 
 // RenderFrame-level plumbing for extension features.
 class ExtensionFrameHelper
     : public content::RenderFrameObserver,
       public content::RenderFrameObserverTracker<ExtensionFrameHelper> {
  public:
   ExtensionFrameHelper(content::RenderFrame* render_frame,
                        Dispatcher* extension_dispatcher);
   ~ExtensionFrameHelper() override;
@@ skipping 36 matching lines @@
   // Schedule a callback, to be run at the next RunScriptsAtDocumentStart
   // notification. Only call this when you are certain that there will be such a
   // notification, e.g. from RenderFrameObserver::DidCreateDocumentElement.
   // Otherwise the callback is never invoked, or invoked for a document that you
   // were not expecting.
   void ScheduleAtDocumentStart(const base::Closure& callback);
 
   // Schedule a callback, to be run at the next RunScriptsAtDocumentEnd call.
   void ScheduleAtDocumentEnd(const base::Closure& callback);
 
-  // Sends a message to the browser requesting a port id. |callback| will be
-  // invoked with the global port id when the browser responds.
-  void RequestPortId(const ExtensionMsg_ExternalConnectionInfo& info,
-                     const std::string& channel_name,
-                     bool include_tls_channel_id,
-                     const base::Callback<void(int)>& callback);
-  void RequestTabPortId(const ExtensionMsg_TabTargetConnectionInfo& info,
-                        const std::string& extension_id,
-                        const std::string& channel_name,
-                        const base::Callback<void(int)>& callback);
-  void RequestNativeAppPortId(const std::string& native_app_name,
-                              const base::Callback<void(int)>& callback);
-  int RequestSyncPortId(const ExtensionMsg_ExternalConnectionInfo& info,
-                        const std::string& channel_name,
-                        bool include_tls_channel_id);
-
  private:
-  struct PendingPortRequest;
-
   // RenderFrameObserver implementation.
   void DidCreateDocumentElement() override;
   void DidCreateNewDocument() override;
   void DidMatchCSS(
       const blink::WebVector<blink::WebString>& newly_matching_selectors,
       const blink::WebVector<blink::WebString>& stopped_matching_selectors)
           override;
   void DidStartProvisionalLoad() override;
   void DidCreateScriptContext(v8::Local<v8::Context>,
                               int extension_group,
                               int world_id) override;
   void WillReleaseScriptContext(v8::Local<v8::Context>, int world_id) override;
   bool OnMessageReceived(const IPC::Message& message) override;
   void OnDestruct() override;
 
   // IPC handlers.
-  void OnExtensionValidateMessagePort(int port_id);
+  void OnExtensionValidateMessagePort(const PortId& id);
   void OnExtensionDispatchOnConnect(
-      int target_port_id,
+      const PortId& target_port_id,
       const std::string& channel_name,
       const ExtensionMsg_TabConnectionInfo& source,
       const ExtensionMsg_ExternalConnectionInfo& info,
       const std::string& tls_channel_id);
-  void OnExtensionDeliverMessage(int target_port_id,
+  void OnExtensionDeliverMessage(const PortId& target_port_id,
                                  const Message& message);
-  void OnExtensionDispatchOnDisconnect(int port_id,
+  void OnExtensionDispatchOnDisconnect(const PortId& id,
                                        const std::string& error_message);
   void OnExtensionSetTabId(int tab_id);
   void OnUpdateBrowserWindowId(int browser_window_id);
   void OnNotifyRendererViewType(ViewType view_type);
   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& module_name,
                                 const std::string& function_name,
                                 const base::ListValue& args);
-  void OnAssignPortId(int port_id, int request_id);
 
   // Type of view associated with the RenderFrame.
   ViewType view_type_;
 
   // The id of the tab the render frame is attached to.
   int tab_id_;
 
   // The id of the browser window the render frame is attached to.
   int browser_window_id_;
 
   Dispatcher* extension_dispatcher_;
 
   // Whether or not the current document element has been created.
   bool did_create_current_document_element_;
 
   // Callbacks to be run at the next RunScriptsAtDocumentStart notification.
   std::vector<base::Closure> document_element_created_callbacks_;
 
   // Callbacks to be run at the next RunScriptsAtDocumentEnd notification.
   std::vector<base::Closure> document_load_finished_callbacks_;
 
-  // Counter for port requests.
-  int next_port_request_id_;
-
-  // Map of port requests to callbacks.
-  std::map<int, std::unique_ptr<PendingPortRequest>> pending_port_requests_;
-
   bool delayed_main_world_script_initialization_ = false;
 
   base::WeakPtrFactory<ExtensionFrameHelper> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionFrameHelper);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_RENDERER_EXTENSION_FRAME_HELPER_H_