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

mandoline/ui/desktop_ui/browser_manager.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 MANDOLINE_UI_DESKTOP_UI_BROWSER_MANAGER_H_
 #define MANDOLINE_UI_DESKTOP_UI_BROWSER_MANAGER_H_
 
 #include <set>
 
 #include "base/macros.h"
 #include "components/mus/public/interfaces/window_tree_host.mojom.h"
 #include "mandoline/ui/desktop_ui/public/interfaces/launch_handler.mojom.h"
 #include "mojo/common/weak_binding_set.h"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
 #include "mojo/shell/public/cpp/application_delegate.h"
-#include "mojo/shell/public/cpp/application_impl.h"
-#include "mojo/shell/public/cpp/connect.h"
 #include "url/gurl.h"
 
 namespace mojo {
 class View;
 }
 
 namespace mandoline {
 
 class BrowserWindow;
 
@@ skipping 11 matching lines @@
   void BrowserWindowClosed(BrowserWindow* browser);
 
   // Get the time recorded just before the application message loop was started.
   const base::TimeTicks& startup_ticks() const { return startup_ticks_; }
 
  private:
   // Overridden from LaunchHandler:
   void LaunchURL(const mojo::String& url) override;
 
   // Overridden from mojo::ApplicationDelegate:
-  void Initialize(mojo::ApplicationImpl* app) override;
+  void Initialize(mojo::Shell* shell, const std::string& url,
+                  uint32_t id) override;
   bool AcceptConnection(
       mojo::ApplicationConnection* connection) override;
 
   // Overridden from mojo::InterfaceFactory<LaunchHandler>:
   void Create(mojo::ApplicationConnection* connection,
               mojo::InterfaceRequest<LaunchHandler> request) override;
 
-  mojo::ApplicationImpl* app_;
+  mojo::Shell* shell_;
   mojo::TracingImpl tracing_;
   mus::mojom::WindowTreeHostFactoryPtr host_factory_;
   mojo::WeakBindingSet<LaunchHandler> launch_handler_bindings_;
   std::set<BrowserWindow*> browsers_;
   const base::TimeTicks startup_ticks_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserManager);
 };
 
 }  // namespace mandoline
 
 #endif  // MANDOLINE_UI_DESKTOP_UI_BROWSER_MANAGER_H_