Remove code that was only used by navigator.connect.

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 010600300da401de83bea736d648f99792c3e9c3..0a64396bed1697d18dede3f304f312bf33a78087 100644
--- a/content/browser/message_port_provider_browsertest.cc
+++ b/content/browser/message_port_provider_browsertest.cc
@@ -26,8 +26,8 @@ class MockMessagePortDelegate : public MessagePortDelegate {
   // A container to hold received messages
   struct Message {
     int route_id;  // the routing id of the target port
-    MessagePortMessage data;  // the message data
-    std::vector<TransferredMessagePort> sent_ports;  // any transferred ports
+    base::string16 data;  // the message data
+    std::vector<int> sent_ports;  // any transferred ports
   };
 
   typedef std::vector<Message> Messages;
@@ -38,8 +38,8 @@ class MockMessagePortDelegate : public MessagePortDelegate {
   // MessagePortDelegate implementation
   void SendMessage(
       int route_id,
-      const MessagePortMessage& message,
-      const std::vector<TransferredMessagePort>& sent_message_ports) override {
+      const base::string16& message,
+      const std::vector<int>& sent_message_ports) override {
     Message m;
     m.route_id = route_id;
     m.data = message;
@@ -77,7 +77,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<TransferredMessagePort> ports;
+  const std::vector<int> ports;
   content::TitleWatcher title_watcher(shell()->web_contents(), message);
   MessagePortProvider::PostMessageToFrame(shell()->web_contents(),
                                           source_origin,
@@ -101,9 +101,8 @@ void VerifyCreateChannelOnIOThread(base::WaitableEvent* event) {
   MessagePortProvider::CreateMessageChannel(&delegate, &port1, &port2);
   MessagePortService* service = MessagePortService::GetInstance();
   // Send a message to port1 transferring no ports.
-  std::vector<TransferredMessagePort> sent_ports;
-  service->PostMessage(port1, MessagePortMessage(base::string16(MESSAGE1)),
-                       sent_ports);
+  std::vector<int> sent_ports;
+  service->PostMessage(port1, base::string16(MESSAGE1), sent_ports);
   // Verify that message is received
   const MockMessagePortDelegate::Messages& received =
       delegate.getReceivedMessages();
@@ -111,22 +110,21 @@ void VerifyCreateChannelOnIOThread(base::WaitableEvent* event) {
   // Verify that message sent to port1 is received by entangled port, which is
   // port2.
   EXPECT_EQ(received[0].route_id, port2);
-  EXPECT_EQ(received[0].data.message_as_string, MESSAGE1);
+  EXPECT_EQ(received[0].data, MESSAGE1);
   EXPECT_EQ(received[0].sent_ports.size(), 0u);
 
   // Create a new channel, and transfer one of its ports to port2, making sure
   // the transferred port is received.
-  TransferredMessagePort port3;
-  TransferredMessagePort port4;
-  MessagePortProvider::CreateMessageChannel(&delegate, &port3.id, &port4.id);
+  int port3;
+  int port4;
+  MessagePortProvider::CreateMessageChannel(&delegate, &port3, &port4);
   sent_ports.push_back(port3);
-  service->PostMessage(port1, MessagePortMessage(base::string16(MESSAGE2)),
-                       sent_ports);
+  service->PostMessage(port1, base::string16(MESSAGE2), sent_ports);
   EXPECT_EQ(received.size(), 2u);
   EXPECT_EQ(received[1].route_id, port2);
-  EXPECT_EQ(received[1].data.message_as_string, MESSAGE2);
+  EXPECT_EQ(received[1].data, MESSAGE2);
   EXPECT_EQ(received[1].sent_ports.size(), 1u);
-  EXPECT_EQ(received[1].sent_ports[0].id, port3.id);
+  EXPECT_EQ(received[1].sent_ports[0], port3);
 
   event->Signal();
 }