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

mash/shell/shell_application_delegate.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 "mash/shell/shell_application_delegate.h"
 
 #include "base/bind.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 mash {
 namespace shell {
 
 ShellApplicationDelegate::ShellApplicationDelegate()
-    : app_(nullptr), screen_locked_(false) {}
+    : shell_(nullptr), screen_locked_(false) {}
 
 ShellApplicationDelegate::~ShellApplicationDelegate() {}
 
-void ShellApplicationDelegate::Initialize(mojo::ApplicationImpl* app) {
-  app_ = app;
+void ShellApplicationDelegate::Initialize(mojo::Shell* shell,
+                                          const std::string& url,
+                                          uint32_t id) {
+  shell_ = shell;
   StartBrowserDriver();
   StartWindowManager();
   StartWallpaper();
   StartShelf();
   StartQuickLaunch();
 }
 
 bool ShellApplicationDelegate::AcceptConnection(
     mojo::ApplicationConnection* connection) {
   connection->AddService<mash::shell::mojom::Shell>(this);
@@ skipping 78 matching lines @@
   DCHECK(connections_.end() != connection);
   connections_.erase(connection);
 }
 
 void ShellApplicationDelegate::StartRestartableService(
     const std::string& url,
     const base::Closure& restart_callback) {
   // TODO(beng): This would be the place to insert logic that counted restarts
   //             to avoid infinite crash-restart loops.
   scoped_ptr<mojo::ApplicationConnection> connection =
-      app_->ConnectToApplication(url);
+      shell_->ConnectToApplication(url);
   connection->SetRemoteServiceProviderConnectionErrorHandler(restart_callback);
   connections_[url] = std::move(connection);
 }
 
 }  // namespace shell
 }  // namespace main