Add RegisterService, split out of Connect().
- Eliminates client lib's ConnectParams struct as this is no longer needed.
- Converts call sites.
- In Service Manager, RegisterService just calls Connect() with some empty values. The codepath is mostly the same. Note that when the ClientProcessConnection is passed now OnGotResolvedName returns early prior to completing the connection, as RegisterService is not a "connect" action, just a "start" one.
[email protected],[email protected]
Review-Url: https://codereview.chromium.org/2610173003
Cr-Commit-Position: refs/heads/master@{#442114}
diff --git a/content/browser/browser_context.cc b/content/browser/browser_context.cc
index b287a6c..a5728e2 100644
--- a/content/browser/browser_context.cc
+++ b/content/browser/browser_context.cc
@@ -439,15 +439,14 @@
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()->Start(
+ identity, std::move(service), mojo::MakeRequest(&pid_receiver));
pid_receiver->SetPID(base::GetCurrentProcId());
BrowserContextServiceManagerConnectionHolder* connection_holder =
new BrowserContextServiceManagerConnectionHolder(
- service_manager_connection->GetConnector()->Connect(¶ms),
+ service_manager_connection->GetConnector()->Connect(identity),
std::move(service_request));
browser_context->SetUserData(kServiceManagerConnection, connection_holder);
