Refactor browser side navigator.connect code to not use MessagePortService.

content/browser/navigator_connect/service_port_service_impl.cc

 // Copyright 2015 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/navigator_connect/service_port_service_impl.h"
 
 #include "content/browser/message_port_message_filter.h"
 #include "content/browser/message_port_service.h"
 #include "content/browser/navigator_connect/navigator_connect_context_impl.h"
 #include "content/common/service_port_type_converters.h"
@@ skipping 92 matching lines @@
   std::vector<TransferredMessagePort> transferred_ports =
       ports.To<std::vector<TransferredMessagePort>>();
 
   MessagePortService* mps = MessagePortService::GetInstance();
   // First, call QueueMessages for all transferred ports, since the ports
   // haven't sent their own IPC for that.
   for (const TransferredMessagePort& port : transferred_ports) {
     mps->QueueMessages(port.id);
   }
 
-  // Second, pass of the actual to MessagePortService now ServicePort instances
-  // are still backed by MessagePort.
-  mps->PostMessage(port_id, MessagePortMessage(message.To<base::string16>()),
-                   transferred_ports);
+  navigator_connect_context_->PostMessage(
+      port_id, MessagePortMessage(message.To<base::string16>()),
+      transferred_ports);
 }
 
 void ServicePortServiceImpl::ClosePort(int32_t port_id) {
   MessagePortService::GetInstance()->Destroy(port_id);
 }
 
 void ServicePortServiceImpl::OnConnectResult(const ConnectCallback& callback,
                                              int message_port_id,
                                              bool success) {
   callback.Run(success ? SERVICE_PORT_CONNECT_RESULT_ACCEPT
                        : SERVICE_PORT_CONNECT_RESULT_REJECT,
                message_port_id);
 }
 
 }  // namespace content