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

mash/wm/accelerator_registrar_apptest.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 <stdint.h>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "components/mus/public/cpp/event_matcher.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/interfaces/accelerator_registrar.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
-#include "mojo/shell/public/cpp/application_impl.h"
 #include "mojo/shell/public/cpp/application_test_base.h"
 
 using mus::mojom::AcceleratorHandler;
 using mus::mojom::AcceleratorHandlerPtr;
 using mus::mojom::AcceleratorRegistrar;
 using mus::mojom::AcceleratorRegistrarPtr;
 
 namespace mash {
 namespace wm {
 
@@ skipping 41 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(TestAcceleratorHandler);
 };
 
 class AcceleratorRegistrarTest : public mojo::test::ApplicationTestBase {
  public:
   AcceleratorRegistrarTest() {}
   ~AcceleratorRegistrarTest() override {}
 
  protected:
   void ConnectToRegistrar(AcceleratorRegistrarPtr* registrar) {
-    application_impl()->ConnectToService("mojo:desktop_wm", registrar);
+    shell()->ConnectToService("mojo:desktop_wm", registrar);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AcceleratorRegistrarTest);
 };
 
 TEST_F(AcceleratorRegistrarTest, AcceleratorRegistrarBasic) {
   AcceleratorRegistrarPtr registrar_first;
   ConnectToRegistrar(&registrar_first);
   TestAcceleratorHandler handler_first(std::move(registrar_first));
@@ skipping 19 matching lines @@
   EXPECT_FALSE(handler_first.AttemptToInstallAccelerator(
       3, mus::CreateKeyMatcher(mus::mojom::KeyboardCode::N,
                                mus::mojom::kEventFlagShiftDown)));
   EXPECT_FALSE(handler_second.AttemptToInstallAccelerator(
       3, mus::CreateKeyMatcher(mus::mojom::KeyboardCode::N,
                                mus::mojom::kEventFlagShiftDown)));
 }
 
 }  // namespace wm
 }  // namespace mash