mash: Migrate SessionStateDelegate access to WmShell.

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_state_delegate.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/window_state.h"
+#include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/ash_test_helper.h"
 #include "ash/test/test_session_state_delegate.h"
 #include "ash/test/test_shell_delegate.h"
 #include "ash/wm/lock_state_controller.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/window_tree_client.h"
@@ skipping 93 matching lines @@
     return CreateWindowInContainer(kShellWindowId_DefaultContainer);
   }
 
   aura::Window* CreateWindowInAlwaysOnTopContainer() {
     aura::Window* window =
         CreateWindowInContainer(kShellWindowId_AlwaysOnTopContainer);
     window->SetProperty(aura::client::kAlwaysOnTopKey, true);
     return window;
   }
 
-  Shell* shell() const { return Shell::GetInstance(); }
-
  private:
   aura::Window* CreateWindowInContainer(int container_id) {
     aura::Window* root_window = Shell::GetPrimaryRootWindow();
     aura::Window* container = Shell::GetContainer(root_window, container_id);
     aura::Window* window = new aura::Window(nullptr);
     window->set_id(0);
     window->SetType(ui::wm::WINDOW_TYPE_NORMAL);
     window->Init(ui::LAYER_TEXTURED);
     window->Show();
 
@@ skipping 29 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(shell()->session_state_delegate()->IsScreenLocked());
+  EXPECT_TRUE(WmShell::Get()->GetSessionStateDelegate()->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(shell()->session_state_delegate()->IsScreenLocked());
+  EXPECT_FALSE(WmShell::Get()->GetSessionStateDelegate()->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(shell()->session_state_delegate()->IsScreenLocked());
+  EXPECT_TRUE(WmShell::Get()->GetSessionStateDelegate()->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(shell()->session_state_delegate()->IsScreenLocked());
+  EXPECT_FALSE(WmShell::Get()->GetSessionStateDelegate()->IsScreenLocked());
   EXPECT_TRUE(delegate.GetWidget()->IsActive());
   EXPECT_TRUE(delegate.view()->HasFocus());
 }
 
 }  // namespace test
 }  // namespace ash