Change RenderFrame to use InterfaceRegistry et al.

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/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/mojo/service_registry_impl.h"
 #include "content/common/view_messages.h"
 #include "content/public/renderer/render_thread_observer.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/shell/public/cpp/interface_provider.h"
+#include "services/shell/public/cpp/interface_registry.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/web/WebScriptController.h"
 
 namespace content {
 
 MockRenderThread::MockRenderThread()
     : routing_id_(0),
       opener_id_(0),
       new_window_routing_id_(0),
       new_window_main_frame_routing_id_(0),
@@ skipping 147 matching lines @@
 
 #if defined(OS_WIN)
 void MockRenderThread::PreCacheFont(const LOGFONT& log_font) {
 }
 
 void MockRenderThread::ReleaseCachedFonts() {
 }
 
 #endif  // OS_WIN
 
-ServiceRegistry* MockRenderThread::GetServiceRegistry() {
-  if (!service_registry_)
-    service_registry_.reset(new ServiceRegistryImpl);
-  return service_registry_.get();
+shell::InterfaceRegistry* MockRenderThread::GetInterfaceRegistry() {
+  if (!interface_registry_)
+    interface_registry_.reset(new shell::InterfaceRegistry(nullptr));
+  return interface_registry_.get();
+}
+
+shell::InterfaceProvider* MockRenderThread::GetRemoteInterfaces() {
+  if (!remote_interfaces_) {
+    shell::mojom::InterfaceProviderPtr remote_interface_provider;
+    pending_remote_interface_provider_request_ =
+        GetProxy(&remote_interface_provider);
+    remote_interfaces_.reset(new shell::InterfaceProvider(
+        std::move(remote_interface_provider)));
+  }
+  return remote_interfaces_.get();
 }
 
 void MockRenderThread::SendCloseMessage() {
   ViewMsg_Close msg(routing_id_);
   RenderViewImpl::FromRoutingID(routing_id_)->OnMessageReceived(msg);
 }
 
 // The Widget expects to be returned valid route_id.
 void MockRenderThread::OnCreateWidget(int opener_id,
                                       blink::WebPopupType popup_type,
@@ skipping 47 matching lines @@
 void MockRenderThread::OnDuplicateSection(
     base::SharedMemoryHandle renderer_handle,
     base::SharedMemoryHandle* browser_handle) {
   // We don't have to duplicate the input handles since RenderViewTest does not
   // separate a browser process from a renderer process.
   *browser_handle = renderer_handle;
 }
 #endif  // defined(OS_WIN)
 
 }  // namespace content