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

content/common/mojo/mojo_shell_connection_impl.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/common/mojo/mojo_shell_connection_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 54 matching lines @@
 void MojoShellConnectionImpl::WaitForShell(
     mojo::ScopedMessagePipeHandle handle) {
   mojo::ApplicationRequest application_request;
   runner_connection_.reset(mojo::shell::RunnerConnection::ConnectToRunner(
       &application_request, std::move(handle)));
   application_impl_.reset(
       new mojo::ApplicationImpl(this, std::move(application_request)));
   application_impl_->WaitForInitialize();
 }
 
-void MojoShellConnectionImpl::Initialize(mojo::ApplicationImpl* application) {
+void MojoShellConnectionImpl::Initialize(mojo::Shell* shell,
+                                         const std::string& url,
+                                         uint32_t id) {
   initialized_ = true;
 }
 
 bool MojoShellConnectionImpl::AcceptConnection(
     mojo::ApplicationConnection* connection) {
   bool found = false;
   for (auto listener : listeners_)
     found |= listener->AcceptConnection(connection);
   return found;
 }
 
-mojo::ApplicationImpl* MojoShellConnectionImpl::GetApplication() {
+mojo::Shell* MojoShellConnectionImpl::GetShell() {
   DCHECK(initialized_);
   return application_impl_.get();
 }
 
 void MojoShellConnectionImpl::AddListener(Listener* listener) {
   DCHECK(std::find(listeners_.begin(), listeners_.end(), listener) ==
          listeners_.end());
   listeners_.push_back(listener);
 }
 
@@ skipping 11 matching lines @@
 // static
 void MojoShellConnection::Destroy() {
   // This joins the shell controller thread.
   delete Get();
   lazy_tls_ptr.Pointer()->Set(nullptr);
 }
 
 MojoShellConnection::~MojoShellConnection() {}
 
 }  // namespace content