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

content/browser/message_port_provider_browsertest.cc

Index: content/browser/message_port_provider_browsertest.cc
diff --git a/content/browser/message_port_provider_browsertest.cc b/content/browser/message_port_provider_browsertest.cc
index b7f7a639cadcde30460d3599b22e051b5e409f1a..425e08fa954d0bff48739dbf57f4edf3e8fc816f 100644
--- a/content/browser/message_port_provider_browsertest.cc
+++ b/content/browser/message_port_provider_browsertest.cc
@@ -26,7 +26,7 @@ class MockMessagePortDelegate : public MessagePortDelegate {
   struct Message {
     int route_id;  // the routing id of the target port
     MessagePortMessage data;  // the message data
-    std::vector<int> sent_ports;  // any transferred ports
+    std::vector<TransferredMessagePort> sent_ports;  // any transferred ports
   };
 
   typedef std::vector<Message> Messages;
@@ -35,13 +35,14 @@ class MockMessagePortDelegate : public MessagePortDelegate {
   ~MockMessagePortDelegate() override { }
 
   // MessagePortDelegate implementation
-  void SendMessage(int route_id,
-                   const MessagePortMessage& message,
-                   const std::vector<int>& sent_message_port_ids) override {
+  void SendMessage(
+      int route_id,
+      const MessagePortMessage& message,
+      const std::vector<TransferredMessagePort>& sent_message_ports) override {
     Message m;
     m.route_id = route_id;
     m.data = message;
-    m.sent_ports = sent_message_port_ids;
+    m.sent_ports = sent_message_ports;
     messages_.push_back(m);
   }
 
@@ -75,7 +76,7 @@ IN_PROC_BROWSER_TEST_F(MessagePortProviderBrowserTest, PostMessage) {
   content::LoadDataWithBaseURL(shell(), history_url, data, base_url);
   const base::string16 source_origin(base::UTF8ToUTF16("source"));
   const base::string16 message(base::UTF8ToUTF16("success"));
-  const std::vector<int> ports;
+  const std::vector<TransferredMessagePort> ports;
   content::TitleWatcher title_watcher(shell()->web_contents(), message);
   MessagePortProvider::PostMessageToFrame(shell()->web_contents(),
                                           source_origin,
@@ -99,7 +100,7 @@ void VerifyCreateChannelOnIOThread(base::WaitableEvent* event) {
   MessagePortProvider::CreateMessageChannel(&delegate, &port1, &port2);
   MessagePortService* service = MessagePortService::GetInstance();
   // Send a message to port1 transferring no ports.
-  std::vector<int> sent_ports;
+  std::vector<TransferredMessagePort> sent_ports;
   service->PostMessage(port1, MessagePortMessage(base::string16(MESSAGE1)),
                        sent_ports);
   // Verify that message is received
@@ -114,9 +115,9 @@ void VerifyCreateChannelOnIOThread(base::WaitableEvent* event) {
 
   // Create a new channel, and transfer one of its ports to port2, making sure
   // the transferred port is received.
-  int port3;
-  int port4;
-  MessagePortProvider::CreateMessageChannel(&delegate, &port3, &port4);
+  TransferredMessagePort port3;
+  TransferredMessagePort port4;
+  MessagePortProvider::CreateMessageChannel(&delegate, &port3.id, &port4.id);
   sent_ports.push_back(port3);
   service->PostMessage(port1, MessagePortMessage(base::string16(MESSAGE2)),
                        sent_ports);
@@ -124,7 +125,7 @@ void VerifyCreateChannelOnIOThread(base::WaitableEvent* event) {
   EXPECT_EQ(received[1].route_id, port2);
   EXPECT_EQ(received[1].data.message_as_string, MESSAGE2);
   EXPECT_EQ(received[1].sent_ports.size(), 1u);
-  EXPECT_EQ(received[1].sent_ports[0], port3);
+  EXPECT_EQ(received[1].sent_ports[0].id, port3.id);
 
   event->Signal();
 }