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

content/public/test/mock_render_thread.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/test/mock_render_thread.h"
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "content/common/frame_messages.h"
 #include "content/common/render_message_filter.mojom.h"
 #include "content/common/view_messages.h"
 #include "content/public/renderer/render_thread_observer.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/render_view_impl.h"
 #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"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/web/WebScriptController.h"
 
 namespace content {
 
 namespace {
 
@@ skipping 242 matching lines @@
 }
 
 service_manager::InterfaceRegistry* MockRenderThread::GetInterfaceRegistry() {
   if (!interface_registry_) {
     interface_registry_ = base::MakeUnique<service_manager::InterfaceRegistry>(
         service_manager::mojom::kServiceManager_ConnectorSpec);
   }
   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,
                                           const std::string& group_name) {}
 void MockRenderThread::SendCloseMessage() {
   ViewMsg_Close msg(routing_id_);
   RenderViewImpl::FromRoutingID(routing_id_)->OnMessageReceived(msg);
 }
 
 // The Widget expects to be returned a valid route_id.
@@ skipping 45 matching lines @@
 void MockRenderThread::OnCreateWindow(
     const mojom::CreateNewWindowParams& params,
     mojom::CreateNewWindowReply* reply) {
   reply->route_id = new_window_routing_id_;
   reply->main_frame_route_id = new_window_main_frame_routing_id_;
   reply->main_frame_widget_route_id = new_window_main_frame_widget_routing_id_;
   reply->cloned_session_storage_namespace_id = 0;
 }
 
 }  // namespace content