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

mash/browser_driver/browser_driver_application_delegate.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 MASH_BROWSER_DRIVER_BROWSER_DRIVER_APPLICATION_DELEGATE_H_
 #define MASH_BROWSER_DRIVER_BROWSER_DRIVER_APPLICATION_DELEGATE_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 13 matching lines @@
 namespace browser_driver {
 
 class BrowserDriverApplicationDelegate : public mojo::ApplicationDelegate,
                                          public mus::mojom::AcceleratorHandler {
  public:
   BrowserDriverApplicationDelegate();
   ~BrowserDriverApplicationDelegate() override;
 
  private:
   // 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;
 
   // mus::mojom::AcceleratorHandler:
   void OnAccelerator(uint32_t id, mus::mojom::EventPtr event) override;
 
   void AddAccelerators();
 
-  mojo::ApplicationImpl* app_;
+  mojo::Shell* shell_;
   mojo::Binding<mus::mojom::AcceleratorHandler> binding_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserDriverApplicationDelegate);
 };
 
 }  // namespace browser_driver
 }  // namespace mash
 
 #endif  // MASH_BROWSER_DRIVER_BROWSER_DRIVER_APPLICATION_DELEGATE_H_