ash: Use SessionController instead of SessionStateDelegate

chrome/browser/chromeos/login/lock/screen_locker_browsertest.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 "chrome/browser/chromeos/login/lock/screen_locker.h"
 
 #include <memory>
 
 #include "ash/common/wm/window_state.h"
 #include "ash/wm/window_state_aura.h"
@@ skipping 218 matching lines @@
   {
     Waiter waiter(browser());
     browser()
         ->exclusive_access_manager()
         ->fullscreen_controller()
         ->ToggleBrowserFullscreenMode();
     waiter.Wait(false /* not locked */, false /* fullscreen */);
     EXPECT_FALSE(browser_window->IsFullscreen());
   }
 
+  // Browser window should be activated after screen locker is gone. Otherwise,
+  // the rest of the test would fail.
+  ASSERT_EQ(window_state, ash::wm::GetActiveWindowState());
+
   // 2) If the active browser window is in fullscreen and the fullscreen window
   // has all of the pixels, locking the screen should exit fullscreen. The
   // fullscreen window has all of the pixels when in tab fullscreen.
   {
     Waiter waiter(browser());
     content::WebContents* web_contents =
         browser()->tab_strip_model()->GetActiveWebContents();
     browser()
         ->exclusive_access_manager()
         ->fullscreen_controller()
@@ skipping 70 matching lines @@
   EXPECT_EQ("", tester->GetPassword());
 
   // Close the locker to match expectations.
   ScreenLocker::Hide();
   content::RunAllPendingInMessageLoop();
   EXPECT_FALSE(tester->IsLocked());
   EXPECT_TRUE(VerifyLockScreenDismissed());
 }
 
 }  // namespace chromeos