Move yet more from WmShell to Shell

ash/wm/ash_focus_rules_unittest.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 "ash/common/session/session_controller.h"
 #include "ash/common/test/test_session_controller_client.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_shell.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shell.h"
@@ skipping 76 matching lines @@
 // |AshFocusRules| when locking and unlocking the screen.
 class LockScreenAshFocusRulesTest : public AshTestBase {
  public:
   LockScreenAshFocusRulesTest() {}
   ~LockScreenAshFocusRulesTest() override {}
 
   void SetUp() override {
     AshTestBase::SetUp();
     ash_test_helper()->set_test_session_controller_client(
         base::MakeUnique<LockScreenSessionControllerClient>(
-            WmShell::Get()->session_controller()));
+            Shell::Get()->session_controller()));
   }
 
   void TearDown() override { AshTestBase::TearDown(); }
 
   aura::Window* CreateWindowInDefaultContainer() {
     return CreateWindowInContainer(kShellWindowId_DefaultContainer);
   }
 
   aura::Window* CreateWindowInAlwaysOnTopContainer() {
     aura::Window* window =
@@ skipping 48 matching lines @@
   wm::WindowState* normal_window_state =
       wm::GetWindowState(normal_window.get());
   wm::WindowState* always_on_top_window_state =
       wm::GetWindowState(always_on_top_window.get());
 
   EXPECT_TRUE(normal_window_state->CanActivate());
   EXPECT_TRUE(always_on_top_window_state->CanActivate());
 
   BlockUserSession(BLOCKED_BY_LOCK_SCREEN);
 
-  EXPECT_TRUE(WmShell::Get()->session_controller()->IsScreenLocked());
+  EXPECT_TRUE(Shell::Get()->session_controller()->IsScreenLocked());
   EXPECT_FALSE(normal_window->HasFocus());
   EXPECT_FALSE(always_on_top_window->HasFocus());
   EXPECT_FALSE(normal_window_state->IsMinimized());
   EXPECT_FALSE(always_on_top_window_state->IsMinimized());
   EXPECT_FALSE(normal_window_state->CanActivate());
   EXPECT_FALSE(always_on_top_window_state->CanActivate());
 
   UnblockUserSession();
 
-  EXPECT_FALSE(WmShell::Get()->session_controller()->IsScreenLocked());
+  EXPECT_FALSE(Shell::Get()->session_controller()->IsScreenLocked());
   EXPECT_FALSE(normal_window_state->IsMinimized());
   EXPECT_FALSE(always_on_top_window_state->IsMinimized());
   EXPECT_TRUE(normal_window_state->CanActivate());
   EXPECT_TRUE(always_on_top_window_state->CanActivate());
   EXPECT_FALSE(always_on_top_window->HasFocus());
   EXPECT_TRUE(normal_window->HasFocus());
 }
 
 // Tests that if a widget has a view which should be initially focused, this
 // view doesn't get focused if the widget shows behind the lock screen.
 TEST_F(LockScreenAshFocusRulesTest, PreventFocusChangeWithLockScreenPresent) {
   BlockUserSession(BLOCKED_BY_LOCK_SCREEN);
-  EXPECT_TRUE(WmShell::Get()->session_controller()->IsScreenLocked());
+  EXPECT_TRUE(Shell::Get()->session_controller()->IsScreenLocked());
 
   views::test::TestInitialFocusWidgetDelegate delegate(CurrentContext());
   EXPECT_FALSE(delegate.view()->HasFocus());
   delegate.GetWidget()->Show();
   EXPECT_FALSE(delegate.GetWidget()->IsActive());
   EXPECT_FALSE(delegate.view()->HasFocus());
 
   UnblockUserSession();
-  EXPECT_FALSE(WmShell::Get()->session_controller()->IsScreenLocked());
+  EXPECT_FALSE(Shell::Get()->session_controller()->IsScreenLocked());
   EXPECT_TRUE(delegate.GetWidget()->IsActive());
   EXPECT_TRUE(delegate.view()->HasFocus());
 }
 
 }  // namespace test
 }  // namespace ash