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

content/common/mojo/mojo_shell_connection_impl.h

 // 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.
 
 #ifndef CONTENT_COMMON_MOJO_SHELL_CONNECTION_IMPL_H_
 #define CONTENT_COMMON_MOJO_SHELL_CONNECTION_IMPL_H_
 
 #include <vector>
 
 #include "base/macros.h"
@@ skipping 32 matching lines @@
 
   // Same as BindToCommandLinePlatformChannel(), but receives a |handle| instead
   // of looking for one on the command line.
   void BindToMessagePipe(mojo::ScopedMessagePipeHandle handle);
 
  private:
   MojoShellConnectionImpl();
   ~MojoShellConnectionImpl() override;
 
   // mojo::ApplicationDelegate:
-  void Initialize(mojo::ApplicationImpl* application) override;
+  void Initialize(mojo::Shell* shell, const std::string& url,
+                  uint32_t id) override;
   bool AcceptConnection(
       mojo::ApplicationConnection* connection) override;
 
   // MojoShellConnection:
-  mojo::ApplicationImpl* GetApplication() override;
+  mojo::Shell* GetShell() override;
   void AddListener(Listener* listener) override;
   void RemoveListener(Listener* listener) override;
 
   // Blocks the calling thread until a connection to the spawning shell is
   // established, an Application request from it is bound, and the Initialize()
   // method on that application is called.
   void WaitForShell(mojo::ScopedMessagePipeHandle handle);
 
   bool initialized_;
   scoped_ptr<mojo::shell::RunnerConnection> runner_connection_;
   scoped_ptr<mojo::ApplicationImpl> application_impl_;
   std::vector<Listener*> listeners_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoShellConnectionImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_MOJO_SHELL_CONNECTION_IMPL_H_