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

mash/screenlock/screenlock.h

 // Copyright 2016 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_SCREENLOCK_SCREENLOCK_H_
 #define MASH_SCREENLOCK_SCREENLOCK_H_
 
 #include <map>
 
 #include "base/macros.h"
@@ skipping 11 matching lines @@
 namespace screenlock {
 
 class Screenlock : public mojo::ApplicationDelegate,
                    public shell::mojom::ScreenlockStateListener {
  public:
   Screenlock();
   ~Screenlock() override;
 
  private:
   // mojo::ApplicationDelegate:
-  void Initialize(mojo::ApplicationImpl* app) override;
+  void Initialize(mojo::Shell* shell, const std::string& url,
+                  uint32_t id) override;
 
   // mash::shell::mojom::ScreenlockStateListener:
   void ScreenlockStateChanged(bool locked) override;
 
-  mojo::ApplicationImpl* app_;
+  mojo::Shell* shell_;
   mojo::TracingImpl tracing_;
   scoped_ptr<views::AuraInit> aura_init_;
   mojo::WeakBindingSet<mash::shell::mojom::ScreenlockStateListener> bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(Screenlock);
 };
 
 }  // namespace screenlock
 }  // namespace mash
 
 #endif  // MASH_SCREENLOCK_SCREENLOCK_H_