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

mash/wm/window_manager_impl.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/wm/window_manager_impl.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "components/mus/common/types.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_property.h"
 #include "components/mus/public/cpp/window_tree_connection.h"
 #include "components/mus/public/interfaces/input_events.mojom.h"
 #include "components/mus/public/interfaces/mus_constants.mojom.h"
 #include "components/mus/public/interfaces/window_manager.mojom.h"
 #include "mash/wm/non_client_frame_controller.h"
 #include "mash/wm/property_util.h"
 #include "mash/wm/public/interfaces/container.mojom.h"
 #include "mash/wm/window_manager_application.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
-#include "mojo/shell/public/cpp/application_impl.h"
 
 namespace mash {
 namespace wm {
 
 WindowManagerImpl::WindowManagerImpl()
     : state_(nullptr), window_manager_client_(nullptr), binding_(this) {}
 
 WindowManagerImpl::~WindowManagerImpl() {
   if (!state_)
     return;
@@ skipping 140 matching lines @@
 
 void WindowManagerImpl::ScreenlockStateChanged(bool locked) {
   // Hide USER_PRIVATE windows when the screen is locked.
   mus::Window* window =
       state_->GetWindowForContainer(mash::wm::mojom::Container::USER_PRIVATE);
   window->SetVisible(!locked);
 }
 
 }  // namespace wm
 }  // namespace mash