[Extensions] Extension Port Ids and Initialization 2.0

chrome/browser/extensions/api/messaging/native_message_port.h

Index: chrome/browser/extensions/api/messaging/native_message_port.h
diff --git a/chrome/browser/extensions/api/messaging/native_message_port.h b/chrome/browser/extensions/api/messaging/native_message_port.h
index 330bec2cebc75dc55caf424a10cfe63a887ced51..ecfa6ac9f1fc83ab043aa603fc161aeb22bcdee4 100644
--- a/chrome/browser/extensions/api/messaging/native_message_port.h
+++ b/chrome/browser/extensions/api/messaging/native_message_port.h
@@ -7,6 +7,7 @@
 
 #include "base/threading/thread_checker.h"
 #include "chrome/browser/extensions/api/messaging/message_service.h"
+#include "extensions/common/api/messaging/port_id.h"
 
 namespace extensions {
 
@@ -15,7 +16,7 @@ namespace extensions {
 class NativeMessagePort : public MessageService::MessagePort {
  public:
   NativeMessagePort(base::WeakPtr<MessageService> message_service,
-                    int port_id,
+                    const PortId& port_id,
                     std::unique_ptr<NativeMessageHost> native_message_host);
   ~NativeMessagePort() override;
 
@@ -31,7 +32,7 @@ class NativeMessagePort : public MessageService::MessagePort {
   base::ThreadChecker thread_checker_;
   base::WeakPtr<MessageService> weak_message_service_;
   scoped_refptr<base::SingleThreadTaskRunner> host_task_runner_;
-  int port_id_;
+  const PortId port_id_;
   std::unique_ptr<Core> core_;
 
   base::WeakPtrFactory<NativeMessagePort> weak_factory_;