Eliminate MojoApplicationHost

content/renderer/render_thread_impl.cc

Index: content/renderer/render_thread_impl.cc
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 3fc1dfe73df87f6b55529d03272309c81182b151..feb7b896cba932f2d22ac1e758e040a2d06ff88e 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -824,22 +824,20 @@ void RenderThreadImpl::Init(
       ChildThreadImpl::discardable_shared_memory_manager());
 
   GetContentClient()->renderer()->RegisterProcessMojoInterfaces(
-      interface_registry());
+      GetInterfaceRegistry());
 
-  interface_registry()->AddInterface(base::Bind(CreateFrameFactory));
-  interface_registry()->AddInterface(base::Bind(CreateEmbeddedWorkerSetup));
+  GetInterfaceRegistry()->AddInterface(base::Bind(CreateFrameFactory));
+  GetInterfaceRegistry()->AddInterface(base::Bind(CreateEmbeddedWorkerSetup));
 
 #if defined(MOJO_SHELL_CLIENT)
   // We may not have a MojoShellConnection object in tests that directly
   // instantiate a RenderThreadImpl.
-  if (MojoShellConnection::GetForProcess() &&
-      base::CommandLine::ForCurrentProcess()->HasSwitch(
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kUseMusInRenderer))
     CreateRenderWidgetWindowTreeClientFactory();
 #endif
 
-  remote_interfaces()->GetInterface(
-      mojo::GetProxy(&storage_partition_service_));
+  GetRemoteInterfaces()->GetInterface(&storage_partition_service_);
 
   is_renderer_suspended_ = false;
 }
@@ -1155,7 +1153,7 @@ void RenderThreadImpl::InitializeWebKit(
 
   blink_platform_impl_.reset(new RendererBlinkPlatformImpl(
       renderer_scheduler_.get(),
-      remote_interfaces()->GetWeakPtr()));
+      GetRemoteInterfaces()->GetWeakPtr()));
   blink::initialize(blink_platform_impl_.get());
 
   v8::Isolate* isolate = blink::mainThreadIsolate();
@@ -1543,16 +1541,6 @@ void RenderThreadImpl::PreCacheFontCharacters(const LOGFONT& log_font,
 
 #endif  // OS_WIN
 
-shell::InterfaceRegistry* RenderThreadImpl::GetInterfaceRegistry() {
-  DCHECK(interface_registry());
-  return interface_registry();
-}
-
-shell::InterfaceProvider* RenderThreadImpl::GetRemoteInterfaces() {
-  DCHECK(remote_interfaces());
-  return remote_interfaces();
-}
-
 bool RenderThreadImpl::IsGpuRasterizationForced() {
   return is_gpu_rasterization_forced_;
 }
@@ -1812,8 +1800,7 @@ RenderThreadImpl::CreateCompositorOutputSurface(
     use_software = true;
 
 #if defined(MOJO_SHELL_CLIENT)
-  if (MojoShellConnection::GetForProcess() && !use_software &&
-      command_line.HasSwitch(switches::kUseMusInRenderer)) {
+  if (!use_software && command_line.HasSwitch(switches::kUseMusInRenderer)) {
     RenderWidgetMusConnection* connection =
         RenderWidgetMusConnection::GetOrCreate(routing_id);
     return connection->CreateOutputSurface();