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

content/browser/mojo/mojo_shell_client_host.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/mojo/mojo_shell_client_host.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "content/common/mojo/mojo_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_process_host_observer.h"
 #include "content/public/common/mojo_shell_connection.h"
 #include "ipc/ipc_sender.h"
 #include "mojo/converters/network/network_type_converters.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/edk/embedder/platform_channel_pair.h"
 #include "mojo/edk/embedder/scoped_platform_handle.h"
-#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/shell.h"
 #include "mojo/shell/public/interfaces/application_manager.mojom.h"
 
 namespace content {
 namespace {
 
 const char kMojoShellInstanceURL[] = "mojo_shell_instance_url";
 const char kMojoPlatformFile[] = "mojo_platform_file";
 
 base::PlatformFile PlatformFileFromScopedPlatformHandle(
     mojo::edk::ScopedPlatformHandle handle) {
@@ skipping 77 matching lines @@
 
 void ConnectChildToShell(
     int child_process_id,
     base::WeakPtr<RenderProcessHost> render_process_host,
     mojo::InterfaceRequest<mojo::shell::mojom::PIDReceiver> request,
     mojo::ScopedMessagePipeHandle pipe) {
   if (!render_process_host)
     return;
 
   mojo::shell::mojom::ApplicationManagerPtr application_manager;
-  MojoShellConnection::Get()->GetApplication()->ConnectToService(
+  MojoShellConnection::Get()->GetShell()->ConnectToService(
       "mojo:shell", &application_manager);
 
   // The content of the URL/qualifier we pass is actually meaningless, it's only
   // important that they're unique per process.
   // TODO(beng): We need to specify a restrictive CapabilityFilter here that
   //             matches the needs of the target process. Figure out where that
   //             specification is best determined (not here, this is a common
   //             chokepoint for all process types) and how to wire it through.
   //             http://crbug.com/555393
   std::string url =
@@ skipping 67 matching lines @@
     RenderProcessHost* render_process_host) {
   InstanceShellHandle* client_file = static_cast<InstanceShellHandle*>(
       render_process_host->GetUserData(kMojoPlatformFile));
   if (!client_file)
     return;
   render_process_host->Send(new MojoMsg_BindExternalMojoShellHandle(
       IPC::GetFileHandleForProcess(client_file->get(), process_handle, true)));
 }
 
 }  // namespace content