[Extensions] Extension Port Ids and Initialization 2.0

chrome/browser/extensions/api/messaging/extension_message_port.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/extensions/api/messaging/extension_message_port.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/scoped_observer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/interstitial_page.h"
@@ skipping 73 matching lines @@
   // Set to the main frame of an interstitial if we are tracking an interstitial
   // page, because RenderFrameDeleted is never triggered for frames in an
   // interstitial (and we only support tracking the interstitial's main frame).
   content::RenderFrameHost* interstitial_frame_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameTracker);
 };
 
 ExtensionMessagePort::ExtensionMessagePort(
     base::WeakPtr<MessageService> message_service,
-    int port_id,
+    const PortId& port_id,
     const std::string& extension_id,
     content::RenderProcessHost* extension_process)
     : weak_message_service_(message_service),
       port_id_(port_id),
       extension_id_(extension_id),
       browser_context_(extension_process->GetBrowserContext()),
       extension_process_(extension_process),
       did_create_port_(false),
       background_host_ptr_(nullptr),
       frame_tracker_(new FrameTracker(this)) {
   auto all_hosts = ProcessManager::Get(browser_context_)
                        ->GetRenderFrameHostsForExtension(extension_id);
   for (content::RenderFrameHost* rfh : all_hosts)
     RegisterFrame(rfh);
 
   frame_tracker_->TrackExtensionProcessFrames();
 }
 
 ExtensionMessagePort::ExtensionMessagePort(
     base::WeakPtr<MessageService> message_service,
-    int port_id,
+    const PortId& port_id,
     const std::string& extension_id,
     content::RenderFrameHost* rfh,
     bool include_child_frames)
     : weak_message_service_(message_service),
       port_id_(port_id),
       extension_id_(extension_id),
       browser_context_(rfh->GetProcess()->GetBrowserContext()),
       extension_process_(nullptr),
       did_create_port_(false),
       background_host_ptr_(nullptr),
@@ skipping 174 matching lines @@
     return;
   }
   for (content::RenderFrameHost* rfh : frames_) {
     IPC::Message* msg_copy = new IPC::Message(*msg);
     msg_copy->set_routing_id(rfh->GetRoutingID());
     rfh->Send(msg_copy);
   }
 }
 
 }  // namespace extensions