Extract shell methods from ApplicationImpl into a base class, and pass this to Initialize() instead.

content/renderer/mus/render_widget_mus_connection.cc

 // Copyright 2015 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/renderer/mus/render_widget_mus_connection.h"
 
 #include <map>
 
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "components/mus/public/cpp/context_provider.h"
 #include "components/mus/public/cpp/output_surface.h"
 #include "components/mus/public/interfaces/command_buffer.mojom.h"
 #include "components/mus/public/interfaces/compositor_frame.mojom.h"
 #include "components/mus/public/interfaces/gpu.mojom.h"
 #include "components/mus/public/interfaces/window_tree.mojom.h"
 #include "content/public/common/mojo_shell_connection.h"
 #include "content/renderer/mus/compositor_mus_connection.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/render_view_impl.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/surfaces/surfaces_utils.h"
-#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/shell.h"
 
 namespace content {
 
 namespace {
 
 typedef std::map<int, RenderWidgetMusConnection*> ConnectionMap;
 base::LazyInstance<ConnectionMap>::Leaky g_connections =
     LAZY_INSTANCE_INITIALIZER;
 }
 
 void RenderWidgetMusConnection::Bind(
     mojo::InterfaceRequest<mus::mojom::WindowTreeClient> request) {
   DCHECK(thread_checker_.CalledOnValidThread());
   RenderThreadImpl* render_thread = RenderThreadImpl::current();
   compositor_mus_connection_ = new CompositorMusConnection(
       routing_id_, render_thread->GetCompositorMainThreadTaskRunner(),
       render_thread->compositor_task_runner(), std::move(request),
       render_thread->input_handler_manager());
   if (window_surface_binding_) {
     compositor_mus_connection_->AttachSurfaceOnMainThread(
         std::move(window_surface_binding_));
   }
 }
 
 scoped_ptr<cc::OutputSurface> RenderWidgetMusConnection::CreateOutputSurface() {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!window_surface_binding_);
   mus::mojom::GpuPtr gpu_service;
-  MojoShellConnection::Get()->GetApplication()->ConnectToService("mojo:mus",
-                                                                 &gpu_service);
+  MojoShellConnection::Get()->GetShell()->ConnectToService("mojo:mus",
+                                                           &gpu_service);
   mus::mojom::CommandBufferPtr cb;
   gpu_service->CreateOffscreenGLES2Context(GetProxy(&cb));
   scoped_refptr<cc::ContextProvider> context_provider(
       new mus::ContextProvider(cb.PassInterface().PassHandle()));
   scoped_ptr<cc::OutputSurface> surface(new mus::OutputSurface(
       context_provider, mus::WindowSurface::Create(&window_surface_binding_)));
   if (compositor_mus_connection_) {
     compositor_mus_connection_->AttachSurfaceOnMainThread(
         std::move(window_surface_binding_));
   }
@@ skipping 104 matching lines @@
   // event could timeout and we could receive the next event before we ack the
   // previous event.
   // DCHECK(pending_ack_.is_null());
   pending_ack_ = ack;
   // TODO(fsamuel, sadrul): Track real latency info.
   ui::LatencyInfo latency_info;
   input_handler_->HandleInputEvent(*input_event, latency_info);
 }
 
 }  // namespace content