Rename SessionStateController -> LockStateController

ash/wm/toplevel_window_event_handler_unittest.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/wm/toplevel_window_event_handler.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/property_util.h"
-#include "ash/wm/session_state_controller_impl.h"
+#include "ash/wm/session_lock_state_controller_impl2.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/snap_sizer.h"
 #include "ash/wm/workspace_controller.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/test/event_generator.h"
@@ skipping 442 matching lines @@
   RunAllPendingInMessageLoop();
   EXPECT_NE(old_bounds.ToString(), target->bounds().ToString());
   EXPECT_TRUE(wm::IsWindowMinimized(target.get()));
   EXPECT_TRUE(GetWindowAlwaysRestoresToRestoreBounds(target.get()));
   EXPECT_EQ(old_bounds.ToString(),
             GetRestoreBoundsInScreen(target.get())->ToString());
 }
 
 // Tests that a gesture cannot minimize a window in login/lock screen.
 TEST_F(ToplevelWindowEventHandlerTest, GestureDragMinimizeLoginScreen) {
-  SessionStateControllerImpl* state_controller =
-      static_cast<SessionStateControllerImpl*>
-      (Shell::GetInstance()->session_state_controller());
+  SessionLockStateControllerImpl2* state_controller =
+      static_cast<SessionLockStateControllerImpl2*>

[Nikita (slow), 2013/05/30 13:16:10]

I fixed static_cast which seems to be incorrect as SessionStateControllerImpl is
only used when new animation are disabled which is not the case for this test.

+      (Shell::GetInstance()->session_lock_state_controller());
   state_controller->OnLoginStateChanged(user::LOGGED_IN_NONE);
   state_controller->OnLockStateChanged(false);
   SetUserLoggedIn(false);
 
   scoped_ptr<aura::Window> target(CreateWindow(HTCAPTION));
   aura::Window* lock = internal::RootWindowController::ForWindow(target.get())->
       GetContainer(internal::kShellWindowId_LockSystemModalContainer);
   lock->AddChild(target.get());
   aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
                                        target.get());
@@ skipping 203 matching lines @@
 
     generator.PressLeftButton();
     generator.MoveMouseBy(10, 11);
     RunAllPendingInMessageLoop();
     EXPECT_EQ("10,11 100x100", target->bounds().ToString());
   }
 }
 
 }  // namespace test
 }  // namespace ash