Moves WindowSelectorController onto WmShell

ash/wm/gestures/overview_gesture_handler_unittest.cc

 // Copyright 2013 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 "ash/common/wm/overview/window_selector_controller.h"
+#include "ash/common/wm_shell.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 
 class OverviewGestureHandlerTest : public test::AshTestBase {
  public:
   OverviewGestureHandlerTest() {}
   ~OverviewGestureHandlerTest() override {}
 
   aura::Window* CreateWindow(const gfx::Rect& bounds) {
     return CreateTestWindowInShellWithDelegate(&delegate_, -1, bounds);
   }
 
   bool IsSelecting() {
-    return ash::Shell::GetInstance()->window_selector_controller()->
-        IsSelecting();
+    return WmShell::Get()->window_selector_controller()->IsSelecting();
   }
 
  private:
   aura::test::TestWindowDelegate delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(OverviewGestureHandlerTest);
 };
 
 // Tests a swipe up with three fingers to enter and a swipe down to exit
 // overview.
@@ skipping 93 matching lines @@
                               start,
                               timestamp,
                               0,
                               0, 10,
                               0, 10,
                               num_fingers);
   generator.Dispatch(&fling_start);
 }
 
 }  // namespace ash