Move more from WmShell to Shell

ash/wm/window_cycle_controller_unittest.cc

 // Copyright 2014 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/window_cycle_controller.h"
 
 #include <algorithm>
 #include <memory>
 
 #include "ash/common/focus_cycler.h"
@@ skipping 133 matching lines @@
 TEST_F(WindowCycleControllerTest, SingleWindowNotActive) {
   WindowCycleController* controller = WmShell::Get()->window_cycle_controller();
 
   // Create a single test window.
   std::unique_ptr<Window> window0(CreateTestWindowInShellWithId(0));
   wm::ActivateWindow(window0.get());
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 
   // Rotate focus, this should move focus to another window that isn't part of
   // the default container.
-  WmShell::Get()->focus_cycler()->RotateFocus(FocusCycler::FORWARD);
+  Shell::Get()->focus_cycler()->RotateFocus(FocusCycler::FORWARD);
   EXPECT_FALSE(wm::IsActiveWindow(window0.get()));
 
   // Cycling should activate the window.
   controller->HandleCycleWindow(WindowCycleController::FORWARD);
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 }
 
 TEST_F(WindowCycleControllerTest, HandleCycleWindow) {
   WindowCycleController* controller = WmShell::Get()->window_cycle_controller();
 
@@ skipping 597 matching lines @@
     // Base case sets the expectation for other cases.
     if (expected_bounds.IsEmpty())
       expected_bounds = display_relative_bounds;
     else
       EXPECT_EQ(expected_bounds, display_relative_bounds);
     controller->CompleteCycling();
   }
 }
 
 }  // namespace ash