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

content/public/test/mock_render_thread.cc

Index: content/public/test/mock_render_thread.cc
diff --git a/content/public/test/mock_render_thread.cc b/content/public/test/mock_render_thread.cc
index 8021b1559488d3d8d7d667f4bf45b9bd640ef77f..393c6fe9d98d08c38452af72f2064fe48aa2e65c 100644
--- a/content/public/test/mock_render_thread.cc
+++ b/content/public/test/mock_render_thread.cc
@@ -18,6 +18,7 @@
 #include "ipc/ipc_message_utils.h"
 #include "ipc/ipc_sync_message.h"
 #include "ipc/message_filter.h"
+#include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/cpp/interface_provider.h"
 #include "services/service_manager/public/cpp/interface_registry.h"
 #include "services/service_manager/public/interfaces/interface_provider_spec.mojom.h"
@@ -280,15 +281,12 @@ service_manager::InterfaceRegistry* MockRenderThread::GetInterfaceRegistry() {
   return interface_registry_.get();
 }
 
-service_manager::InterfaceProvider* MockRenderThread::GetRemoteInterfaces() {
-  if (!remote_interfaces_) {
-    service_manager::mojom::InterfaceProviderPtr remote_interface_provider;
-    pending_remote_interface_provider_request_ =
-        MakeRequest(&remote_interface_provider);
-    remote_interfaces_.reset(new service_manager::InterfaceProvider);
-    remote_interfaces_->Bind(std::move(remote_interface_provider));
+service_manager::Connector* MockRenderThread::GetConnector() {
+  if (!connector_) {
+    connector_ =
+        service_manager::Connector::Create(&pending_connector_request_);
   }
-  return remote_interfaces_.get();
+  return connector_.get();
 }
 
 void MockRenderThread::SetFieldTrialGroup(const std::string& trial_name,