mash: Migrate SessionStateDelegate access to WmShell.

ash/test/ash_test_base.cc

 // Copyright (c) 2012 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/test/ash_test_base.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/common/ash_switches.h"
@@ skipping 119 matching lines @@
 #if defined(OS_WIN)
   ui::test::SetUsePopupAsRootWindowForTest(true);
 #endif
   ash_test_helper_->SetUp(start_session_);
 
   Shell::GetPrimaryRootWindow()->Show();
   Shell::GetPrimaryRootWindow()->GetHost()->Show();
   // Move the mouse cursor to far away so that native events doesn't
   // interfere test expectations.
   Shell::GetPrimaryRootWindow()->MoveCursorTo(gfx::Point(-1000, -1000));
-  ash::Shell::GetInstance()->cursor_manager()->EnableMouseEvents();
+  Shell::GetInstance()->cursor_manager()->EnableMouseEvents();
 
   // Changing GestureConfiguration shouldn't make tests fail. These values
   // prevent unexpected events from being generated during tests. Such as
   // delayed events which create race conditions on slower tests.
   ui::GestureConfiguration* gesture_config =
       ui::GestureConfiguration::GetInstance();
   gesture_config->set_max_touch_down_duration_for_click_in_ms(800);
   gesture_config->set_long_press_time_in_ms(1000);
   gesture_config->set_max_touch_move_in_pixels_for_click(5);
 
 #if defined(OS_WIN)
-  if (!command_line->HasSwitch(ash::switches::kForceAshToDesktop))
-    ash::WindowPositioner::SetMaximizeFirstWindow(true);
+  if (!command_line->HasSwitch(switches::kForceAshToDesktop))
+    WindowPositioner::SetMaximizeFirstWindow(true);
 #endif
 }
 
 void AshTestBase::TearDown() {
   teardown_called_ = true;
   Shell::GetInstance()->OnAppTerminating();
   // Flush the message loop to finish pending release tasks.
   RunAllPendingInMessageLoop();
 
   ash_test_helper_->TearDown();
@@ skipping 92 matching lines @@
   window->set_id(id);
   window->SetType(type);
   window->Init(ui::LAYER_TEXTURED);
   window->Show();
 
   if (bounds.IsEmpty()) {
     ParentWindowInPrimaryRootWindow(window);
   } else {
     display::Display display =
         display::Screen::GetScreen()->GetDisplayMatching(bounds);
-    aura::Window* root = ash::Shell::GetInstance()
+    aura::Window* root = Shell::GetInstance()
                              ->window_tree_host_manager()
                              ->GetRootWindowForDisplayId(display.id());
     gfx::Point origin = bounds.origin();
     ::wm::ConvertPointFromScreen(root, &origin);
     window->SetBounds(gfx::Rect(origin, bounds.size()));
     aura::client::ParentWindowWithContext(window, root, bounds);
   }
   window->SetProperty(aura::client::kCanMaximizeKey, true);
   window->SetProperty(aura::client::kCanMinimizeKey, true);
   return window;
@@ skipping 45 matching lines @@
 void AshTestBase::SetUserAddingScreenRunning(bool user_adding_screen_running) {
   AshTestHelper::GetTestSessionStateDelegate()->SetUserAddingScreenRunning(
       user_adding_screen_running);
 }
 
 void AshTestBase::BlockUserSession(UserSessionBlockReason block_reason) {
   switch (block_reason) {
     case BLOCKED_BY_LOCK_SCREEN:
       SetSessionStarted(true);
       SetUserAddingScreenRunning(false);
-      Shell::GetInstance()->session_state_delegate()->LockScreen();
+      WmShell::Get()->GetSessionStateDelegate()->LockScreen();
       Shell::GetInstance()->OnLockStateChanged(true);
       break;
     case BLOCKED_BY_LOGIN_SCREEN:
       SetUserAddingScreenRunning(false);
       SetSessionStarted(false);
       break;
     case BLOCKED_BY_USER_ADDING_SCREEN:
       SetUserAddingScreenRunning(true);
       SetSessionStarted(true);
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 void AshTestBase::UnblockUserSession() {
-  Shell::GetInstance()->session_state_delegate()->UnlockScreen();
+  WmShell::Get()->GetSessionStateDelegate()->UnlockScreen();
   SetSessionStarted(true);
   SetUserAddingScreenRunning(false);
 }
 
 void AshTestBase::DisableIME() {
   Shell::GetInstance()->RemovePreTargetHandler(
       Shell::GetInstance()
           ->window_tree_host_manager()
           ->input_method_event_handler());
 }
 
 }  // namespace test
 }  // namespace ash