Refactor navigator.connect code to make it more flexible.

content/browser/message_port_service.cc

 // Copyright 2013 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 "content/browser/message_port_service.h"
 
 #include "content/browser/message_port_delegate.h"
 #include "content/common/message_port_messages.h"
 #include "content/public/browser/browser_thread.h"
 
@@ skipping 171 matching lines @@
         std::make_pair(message, sent_message_port_ids));
     return;
   }
 
   if (!entangled_port.delegate) {
     NOTREACHED();
     return;
   }
 
   // Now send the message to the entangled port.
-  entangled_port.delegate->SendMessage(entangled_port.route_id, message,
-                                       sent_message_port_ids);
+  entangled_port.delegate->SendMessageToPort(entangled_port.route_id, message,
+                                             sent_message_port_ids);
 }
 
 void MessagePortService::QueueMessages(int message_port_id) {
   if (!message_ports_.count(message_port_id)) {
     NOTREACHED();
     return;
   }
 
   MessagePort& port = message_ports_[message_port_id];
   if (port.delegate) {
@@ skipping 103 matching lines @@
     // Do the disentanglement (and be paranoid about the other side existing
     // just in case something unusual happened during entanglement).
     if (message_ports_.count(entangled_id)) {
       message_ports_[entangled_id].entangled_message_port_id = MSG_ROUTING_NONE;
     }
   }
   message_ports_.erase(erase_item);
 }
 
 }  // namespace content