ash : Decouple power button controller and session state controller.

chrome/browser/chromeos/power/power_button_observer.cc

Index: chrome/browser/chromeos/power/power_button_observer.cc
diff --git a/chrome/browser/chromeos/power/power_button_observer.cc b/chrome/browser/chromeos/power/power_button_observer.cc
index 173fbfc26db999590c8bd0117f1c6f4972080da6..326b3cb4ee65f045f8a4756ad66db54a52b231b4 100644
--- a/chrome/browser/chromeos/power/power_button_observer.cc
+++ b/chrome/browser/chromeos/power/power_button_observer.cc
@@ -11,7 +11,7 @@
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
-#include "chrome/browser/chromeos/power/power_button_controller_delegate_chromeos.h"
+#include "chrome/browser/chromeos/power/session_state_controller_delegate_chromeos.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "content/public/browser/notification_service.h"
@@ -34,8 +34,8 @@ ash::user::LoginStatus GetCurrentLoginStatus() {
 }  // namespace
 
 PowerButtonObserver::PowerButtonObserver() {
-  ash::Shell::GetInstance()->power_button_controller()->
-      set_delegate(new PowerButtonControllerDelegateChromeos);
+  ash::Shell::GetInstance()->session_state_controller()->
+      set_delegate(new SessionStateControllerDelegateChromeos);
 
   registrar_.Add(
       this,
@@ -100,7 +100,7 @@ void PowerButtonObserver::LockButtonStateChanged(
 }
 
 void PowerButtonObserver::LockScreen() {
-  ash::Shell::GetInstance()->power_button_controller()->OnStartingLock();
+  ash::Shell::GetInstance()->session_state_controller()->OnStartingLock();
 }
 
 }  // namespace chromeos