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

content/browser/renderer_host/render_widget_host_view_mus.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/browser/renderer_host/render_widget_host_view_mus.h"
 
 #include <utility>
 
 #include "build/build_config.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_tree_connection.h"
 #include "content/browser/mojo/mojo_shell_client_host.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/common/render_widget_window_tree_client_factory.mojom.h"
 #include "content/public/common/mojo_shell_connection.h"
-#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/shell.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/window.h"
 #include "ui/base/hit_test.h"
 
 namespace blink {
 struct WebScreenInfo;
 }
 
 namespace content {
 
 RenderWidgetHostViewMus::RenderWidgetHostViewMus(mus::Window* parent_window,
                                                  RenderWidgetHostImpl* host)
     : host_(host), aura_window_(nullptr) {
   DCHECK(parent_window);
   mus::Window* window = parent_window->connection()->NewWindow();
   window->SetVisible(true);
   window->SetBounds(gfx::Rect(300, 300));
   parent_window->AddChild(window);
   mus_window_.reset(new mus::ScopedWindowPtr(window));
   host_->SetView(this);
 
   // Connect to the renderer, pass it a WindowTreeClient interface request
   // and embed that client inside our mus window.
   std::string url = GetMojoApplicationInstanceURL(host_->GetProcess());
   mojom::RenderWidgetWindowTreeClientFactoryPtr factory;
-  MojoShellConnection::Get()->GetApplication()->ConnectToService(url, &factory);
+  MojoShellConnection::Get()->GetShell()->ConnectToService(url, &factory);
 
   mus::mojom::WindowTreeClientPtr window_tree_client;
   factory->CreateWindowTreeClientForRenderWidget(
       host_->GetRoutingID(), mojo::GetProxy(&window_tree_client));
   mus_window_->window()->Embed(std::move(window_tree_client));
 }
 
 RenderWidgetHostViewMus::~RenderWidgetHostViewMus() {}
 
 void RenderWidgetHostViewMus::InternalSetBounds(const gfx::Rect& rect) {
@@ skipping 271 matching lines @@
 void RenderWidgetHostViewMus::SetParentNativeViewAccessible(
     gfx::NativeViewAccessible accessible_parent) {}
 
 gfx::NativeViewId RenderWidgetHostViewMus::GetParentForWindowlessPlugin()
     const {
   return gfx::NativeViewId();
 }
 #endif
 
 }  // namespace content