Move yet 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 209 matching lines @@
   controller->HandleCycleWindow(WindowCycleController::BACKWARD);
   controller->CompleteCycling();
   EXPECT_TRUE(wm::IsActiveWindow(window1.get()));
 
   // Reset our stacking order.
   wm::ActivateWindow(window2.get());
   wm::ActivateWindow(window1.get());
   wm::ActivateWindow(window0.get());
 
   // When the screen is locked, cycling window does not take effect.
-  WmShell::Get()->session_controller()->LockScreenAndFlushForTest();
+  Shell::Get()->session_controller()->LockScreenAndFlushForTest();
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
   controller->HandleCycleWindow(WindowCycleController::FORWARD);
   EXPECT_FALSE(controller->IsCycling());
 
   // Unlock, it works again.
   GetSessionControllerClient()->UnlockScreen();
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
   controller->HandleCycleWindow(WindowCycleController::FORWARD);
   controller->HandleCycleWindow(WindowCycleController::FORWARD);
   controller->CompleteCycling();
@@ skipping 522 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