Add RegisterService, split out of Connect().

content/browser/browser_context.cc

 // Copyright (c) 2012 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/public/browser/browser_context.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <algorithm>
 #include <limits>
@@ skipping 423 matching lines @@
   ServiceManagerConnection* service_manager_connection =
       ServiceManagerConnection::GetForProcess();
   if (service_manager_connection && base::ThreadTaskRunnerHandle::IsSet()) {
     // NOTE: Many unit tests create a TestBrowserContext without initializing
     // Mojo or the global service manager connection.
 
     service_manager::mojom::ServicePtr service;
     service_manager::mojom::ServiceRequest service_request(&service);
 
     service_manager::mojom::PIDReceiverPtr pid_receiver;
-    service_manager::Connector::ConnectParams params(
-        service_manager::Identity(mojom::kBrowserServiceName, new_id));
-    params.set_client_process_connection(std::move(service),
-                                         mojo::MakeRequest(&pid_receiver));
+    service_manager::Identity identity(mojom::kBrowserServiceName, new_id);
+    service_manager_connection->GetConnector()->RegisterService(
+        identity, std::move(service), mojo::MakeRequest(&pid_receiver));
     pid_receiver->SetPID(base::GetCurrentProcId());
 
     BrowserContextServiceManagerConnectionHolder* connection_holder =
         new BrowserContextServiceManagerConnectionHolder(
-            service_manager_connection->GetConnector()->Connect(&params),
+            service_manager_connection->GetConnector()->Connect(identity),
             std::move(service_request));
     browser_context->SetUserData(kServiceManagerConnection, connection_holder);
 
     ServiceManagerConnection* connection =
         connection_holder->service_manager_connection();
     connection->Start();
 
     // New embedded service factories should be added to |connection| here.
     // TODO(blundell): Does this belong as a global service rather than per
     // BrowserContext?
@@ skipping 65 matching lines @@
   if (GetUserData(kDownloadManagerKeyName))
     GetDownloadManager(this)->Shutdown();
 }
 
 void BrowserContext::ShutdownStoragePartitions() {
   if (GetUserData(kStoragePartitionMapKeyName))
     RemoveUserData(kStoragePartitionMapKeyName);
 }
 
 }  // namespace content