Rename SessionStateController -> LockStateController

ash/shell.cc

Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 0f12d3f7cbcf39013129b5fa9eca1d536202ee3f..a162883181dbdbc606e0858e202f65f1c176db10 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -56,9 +56,9 @@
 #include "ash/wm/resize_shadow_controller.h"
 #include "ash/wm/root_window_layout_manager.h"
 #include "ash/wm/screen_dimmer.h"
-#include "ash/wm/session_state_controller.h"
+#include "ash/wm/session_lock_state_controller.h"
+#include "ash/wm/session_lock_state_controller_impl2.h"
 #include "ash/wm/session_state_controller_impl.h"
-#include "ash/wm/session_state_controller_impl2.h"
 #include "ash/wm/system_gesture_event_filter.h"
 #include "ash/wm/system_modal_container_event_filter.h"
 #include "ash/wm/system_modal_container_layout_manager.h"
@@ -298,7 +298,7 @@ Shell::~Shell() {
   video_detector_.reset();
 
   power_button_controller_.reset();
-  session_state_controller_.reset();
+  session_lock_state_controller_.reset();
 
   mirror_window_controller_.reset();
 
@@ -530,12 +530,12 @@ void Shell::Init() {
       delegate_->IsFirstRunAfterBoot());
 
   if (command_line->HasSwitch(ash::switches::kAshDisableNewLockAnimations))
-    session_state_controller_.reset(new SessionStateControllerImpl);
+    session_lock_state_controller_.reset(new SessionStateControllerImpl);
   else
-    session_state_controller_.reset(new SessionStateControllerImpl2);
+    session_lock_state_controller_.reset(new SessionLockStateControllerImpl2);
   power_button_controller_.reset(new PowerButtonController(
-      session_state_controller_.get()));
-  AddShellObserver(session_state_controller_.get());
+      session_lock_state_controller_.get()));
+  AddShellObserver(session_lock_state_controller_.get());
 
   mouse_cursor_filter_.reset(new internal::MouseCursorEventFilter());
   AddPreTargetHandler(mouse_cursor_filter_.get());