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

media/mojo/services/mojo_media_application.cc

Index: media/mojo/services/mojo_media_application.cc
diff --git a/media/mojo/services/mojo_media_application.cc b/media/mojo/services/mojo_media_application.cc
index cac99e0f2b20682891f50a4cf7c3a0de9cf75c2a..4722908cfecabab1b062d4bb7cca7977709222f7 100644
--- a/media/mojo/services/mojo_media_application.cc
+++ b/media/mojo/services/mojo_media_application.cc
@@ -10,7 +10,7 @@
 #include "media/mojo/services/mojo_media_client.h"
 #include "media/mojo/services/service_factory_impl.h"
 #include "mojo/shell/public/cpp/application_connection.h"
-#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/shell.h"
 
 namespace media {
 
@@ -24,14 +24,16 @@ scoped_ptr<mojo::ApplicationDelegate> MojoMediaApplication::CreateApp() {
 MojoMediaApplication::MojoMediaApplication(
     scoped_ptr<MojoMediaClient> mojo_media_client)
     : mojo_media_client_(std::move(mojo_media_client)),
-      app_impl_(nullptr),
+      shell_(nullptr),
       media_log_(new MediaLog()) {}
 
 MojoMediaApplication::~MojoMediaApplication() {
 }
 
-void MojoMediaApplication::Initialize(mojo::ApplicationImpl* app) {
-  app_impl_ = app;
+void MojoMediaApplication::Initialize(mojo::Shell* shell,
+                                      const std::string& url,
+                                      uint32_t id) {
+  shell_ = shell;
   mojo_media_client_->Initialize();
 }
 
@@ -46,8 +48,7 @@ void MojoMediaApplication::Create(
     mojo::InterfaceRequest<interfaces::ServiceFactory> request) {
   // The created object is owned by the pipe.
   new ServiceFactoryImpl(std::move(request), connection->GetServiceProvider(),
-                         media_log_,
-                         app_impl_->app_lifetime_helper()->CreateAppRefCount(),
+                         media_log_, shell_->CreateAppRefCount(),
                          mojo_media_client_.get());
 }