Eliminate MojoApplicationHost

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"
@@ skipping 166 matching lines @@
 
 #if defined(OS_WIN)
 void MockRenderThread::PreCacheFont(const LOGFONT& log_font) {
 }
 
 void MockRenderThread::ReleaseCachedFonts() {
 }
 
 #endif  // OS_WIN
 
+MojoShellConnection* MockRenderThread::GetMojoShellConnection() {
+  return nullptr;
+}
+
 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)));
+    remote_interfaces_.reset(new shell::InterfaceProvider);
+    remote_interfaces_->Bind(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.
@@ skipping 49 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