Step two of optionally sending messages to/from message ports as base::Value.

content/child/webmessageportchannel_impl.h

 // 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.
 
 #ifndef CONTENT_CHILD_WEBMESSAGEPORTCHANNEL_IMPL_H_
 #define CONTENT_CHILD_WEBMESSAGEPORTCHANNEL_IMPL_H_
 
 #include <queue>
 #include <vector>
 
@@ skipping 18 matching lines @@
 class WebMessagePortChannelImpl
     : public blink::WebMessagePortChannel,
       public IPC::Listener,
       public base::RefCountedThreadSafe<WebMessagePortChannelImpl> {
  public:
   explicit WebMessagePortChannelImpl(
       const scoped_refptr<base::SingleThreadTaskRunner>&
           main_thread_task_runner);
   WebMessagePortChannelImpl(
       int route_id,
-      int message_port_id,
+      const TransferredMessagePort& port,
       const scoped_refptr<base::SingleThreadTaskRunner>&
           main_thread_task_runner);
 
   static void CreatePair(
       const scoped_refptr<base::SingleThreadTaskRunner>&
           main_thread_task_runner,
       blink::WebMessagePortChannel** channel1,
       blink::WebMessagePortChannel** channel2);
 
   // Extracts port IDs for passing on to the browser process, and queues any
   // received messages. Takes ownership of the passed array (and deletes it).
-  static std::vector<int> ExtractMessagePortIDs(
+  static std::vector<TransferredMessagePort> ExtractMessagePortIDs(
       blink::WebMessagePortChannelArray* channels);
 
+  // Extracts port IDs for passing on to the browser process, and queues any
+  // received messages.
+  static std::vector<TransferredMessagePort> ExtractMessagePortIDs(
+      const blink::WebMessagePortChannelArray& channels);
+
+  // Creates WebMessagePortChannelImpl instances for port IDs passed in from the
+  // browser process.
+  static blink::WebMessagePortChannelArray CreatePorts(
+      const std::vector<TransferredMessagePort>& message_ports,
+      const std::vector<int>& new_routing_ids,
+      const scoped_refptr<base::SingleThreadTaskRunner>&
+          main_thread_task_runner);
+
   // Queues received and incoming messages until there are no more in-flight
   // messages, then sends all of them to the browser process.
   void QueueMessages();
   int message_port_id() const { return message_port_id_; }
 
  private:
   friend class base::RefCountedThreadSafe<WebMessagePortChannelImpl>;
   ~WebMessagePortChannelImpl() override;
 
   // WebMessagePortChannel implementation.
   virtual void setClient(blink::WebMessagePortChannelClient* client);
   virtual void destroy();
   virtual void postMessage(const blink::WebString& message,
                            blink::WebMessagePortChannelArray* channels);
   virtual bool tryGetMessage(blink::WebString* message,
                              blink::WebMessagePortChannelArray& channels);
 
   void Init();
   void Entangle(scoped_refptr<WebMessagePortChannelImpl> channel);
   void Send(IPC::Message* message);
   void PostMessage(const MessagePortMessage& message,
                    blink::WebMessagePortChannelArray* channels);
 
   // IPC::Listener implementation.
   bool OnMessageReceived(const IPC::Message& message) override;
 
   void OnMessage(const MessagePortMessage& message,
-                 const std::vector<int>& sent_message_port_ids,
+                 const std::vector<TransferredMessagePort>& sent_message_ports,
                  const std::vector<int>& new_routing_ids);
   void OnMessagesQueued();
 
   struct Message {
     Message();
     ~Message();
 
     MessagePortMessage message;
-    std::vector<WebMessagePortChannelImpl*> ports;
+    blink::WebMessagePortChannelArray ports;
   };
 
   typedef std::queue<Message> MessageQueue;
   MessageQueue message_queue_;
 
   blink::WebMessagePortChannelClient* client_;
   base::Lock lock_;  // Locks access to above.
 
   int route_id_;  // The routing id for this object.
   int message_port_id_;  // A globally unique identifier for this message port.
   // Flag to indicate if messages should be sent to the browser process as
   // base::Value instances as opposed to being serialized using the default
   // blink::WebSerializedScriptValue.
   bool send_messages_as_values_;
   scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(WebMessagePortChannelImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_CHILD_WEBMESSAGEPORTCHANNEL_IMPL_H_