Update client side navigator.connect API to use ServicePortCollection [2/3]

content/browser/renderer_host/render_process_host_impl.cc

Index: content/browser/renderer_host/render_process_host_impl.cc
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 537f713a83131cb9a3f7d21ff140294c1a2e6619..248ed1d8b17158adeb873798ca038fb954fa0f68 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -76,7 +76,7 @@
 #include "content/browser/message_port_message_filter.h"
 #include "content/browser/mime_registry_message_filter.h"
 #include "content/browser/mojo/mojo_application_host.h"
-#include "content/browser/navigator_connect/navigator_connect_dispatcher_host.h"
+#include "content/browser/navigator_connect/service_port_service_impl.h"
 #include "content/browser/notifications/notification_message_filter.h"
 #include "content/browser/permissions/permission_service_context.h"
 #include "content/browser/permissions/permission_service_impl.h"
@@ -930,9 +930,6 @@ void RenderProcessHostImpl::CreateMessageFilters() {
 #endif
   AddFilter(new GeofencingDispatcherHost(
       storage_partition_impl_->GetGeofencingManager()));
-  AddFilter(new NavigatorConnectDispatcherHost(
-      storage_partition_impl_->GetNavigatorConnectContext(),
-      message_port_message_filter_.get()));
   if (browser_command_line.HasSwitch(switches::kEnableWebBluetooth)) {
     bluetooth_dispatcher_host_ = new BluetoothDispatcherHost();
     AddFilter(bluetooth_dispatcher_host_.get());
@@ -954,6 +951,11 @@ void RenderProcessHostImpl::RegisterMojoServices() {
       &content::BackgroundSyncServiceImpl::Create,
       base::Unretained(storage_partition_impl_->GetBackgroundSyncContext())));
 
+  mojo_application_host_->service_registry()->AddService(base::Bind(
+      &content::ServicePortServiceImpl::Create,
+      make_scoped_refptr(storage_partition_impl_->GetNavigatorConnectContext()),
+      message_port_message_filter_));
+
 #if defined(OS_ANDROID)
   ServiceRegistrarAndroid::RegisterProcessHostServices(
       mojo_application_host_->service_registry_android());