Begin to wean child processes off reliance on a persistent service_manager::Connection to the brows…

content/child/child_thread_impl.cc

Index: content/child/child_thread_impl.cc
diff --git a/content/child/child_thread_impl.cc b/content/child/child_thread_impl.cc
index 458604f431af855cc781862bbec924b85e2ad701..1369ba4faf3cfaf89b07dee0f7800ce4a86b1837 100644
--- a/content/child/child_thread_impl.cc
+++ b/content/child/child_thread_impl.cc
@@ -454,13 +454,10 @@ void ChildThreadImpl::Init(const Options& options) {
     // When connect_to_browser is true, we obtain interfaces from the browser
     // process by connecting to it, rather than from the incoming interface
     // provider. Exposed interfaces are subject to manifest capability spec.
-    service_manager::InterfaceProvider* remote_interfaces = nullptr;
     if (options.connect_to_browser) {
       browser_connection_ =
           service_manager_connection_->GetConnector()->Connect(
               mojom::kBrowserServiceName);
-    } else {
-      remote_interfaces = GetRemoteInterfaces();
     }
 
     // TODO(rockot): Remove this once all child-to-browser interface connections
@@ -468,7 +465,7 @@ void ChildThreadImpl::Init(const Options& options) {
     // InterfaceProvider, and all exposed interfaces are exposed via a
     // ConnectionFilter.
     service_manager_connection_->SetupInterfaceRequestProxies(
-        GetInterfaceRegistry(), remote_interfaces);
+        GetInterfaceRegistry(), nullptr);
   }
 
   sync_message_filter_ = channel_->CreateSyncMessageFilter();
@@ -507,7 +504,7 @@ void ChildThreadImpl::Init(const Options& options) {
     channel_->AddFilter(new ChildMemoryMessageFilter());
 
     memory_instrumentation::MemoryDumpManagerDelegateImpl::Config config(
-        GetRemoteInterfaces());
+        GetConnector(), mojom::kBrowserServiceName);
     auto delegate =
         base::MakeUnique<memory_instrumentation::MemoryDumpManagerDelegateImpl>(
             config);
@@ -652,13 +649,8 @@ service_manager::InterfaceRegistry* ChildThreadImpl::GetInterfaceRegistry() {
   return interface_registry_.get();
 }
 
-service_manager::InterfaceProvider* ChildThreadImpl::GetRemoteInterfaces() {
-  if (browser_connection_)
-    return browser_connection_->GetRemoteInterfaces();
-
-  if (!remote_interfaces_.get())
-    remote_interfaces_.reset(new service_manager::InterfaceProvider);
-  return remote_interfaces_.get();
+service_manager::Connector* ChildThreadImpl::GetConnector() {
+  return service_manager_connection_->GetConnector();
 }
 
 const service_manager::ServiceInfo&