Revert "chromeos: move screen lock handling to power manager client"

chrome/browser/chromeos/login/screen_locker.cc

Index: chrome/browser/chromeos/login/screen_locker.cc
diff --git a/chrome/browser/chromeos/login/screen_locker.cc b/chrome/browser/chromeos/login/screen_locker.cc
index 5c0e1f6b0b68190d23ec3756ac071eeeef29570c..6e13b98646f7fc33f532af95c21e1ef3beee8bc7 100644
--- a/chrome/browser/chromeos/login/screen_locker.cc
+++ b/chrome/browser/chromeos/login/screen_locker.cc
@@ -16,8 +16,9 @@
 #include "base/string_util.h"
 #include "base/timer.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/browser/chromeos/cros/screen_lock_library.h"
 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/power_manager_client.h"
 #include "chrome/browser/chromeos/dbus/session_manager_client.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
@@ -54,7 +55,7 @@ using content::BrowserThread;
 namespace {
 
 // Observer to start ScreenLocker when the screen lock
-class ScreenLockObserver : public chromeos::PowerManagerClient::Observer,
+class ScreenLockObserver : public chromeos::ScreenLockLibrary::Observer,
                            public content::NotificationObserver {
  public:
   ScreenLockObserver() {
@@ -69,23 +70,22 @@ class ScreenLockObserver : public chromeos::PowerManagerClient::Observer,
     if (type == chrome::NOTIFICATION_LOGIN_USER_CHANGED) {
       // Register Screen Lock after login screen to make sure
       // we don't show the screen lock on top of the login screen by accident.
-      chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
-          AddObserver(this);
+      chromeos::CrosLibrary::Get()->GetScreenLockLibrary()->AddObserver(this);
     }
   }
 
-  virtual void LockScreen() OVERRIDE {
+  virtual void LockScreen(chromeos::ScreenLockLibrary* obj) OVERRIDE {
     VLOG(1) << "In: ScreenLockObserver::LockScreen";
     SetupInputMethodsForScreenLocker();
     chromeos::ScreenLocker::Show();
   }
 
-  virtual void UnlockScreen() OVERRIDE {
+  virtual void UnlockScreen(chromeos::ScreenLockLibrary* obj) OVERRIDE {
     RestoreInputMethods();
     chromeos::ScreenLocker::Hide();
   }
 
-  virtual void UnlockScreenFailed() OVERRIDE {
+  virtual void UnlockScreenFailed(chromeos::ScreenLockLibrary* obj) OVERRIDE {
     chromeos::ScreenLocker::UnlockScreenFailed();
   }
 
@@ -271,8 +271,7 @@ void ScreenLocker::OnLoginSuccess(
       service->SetPassphrase(password, false);
     }
   }
-  DBusThreadManager::Get()->GetPowerManagerClient()->
-      NotifyScreenUnlockRequested();
+  CrosLibrary::Get()->GetScreenLockLibrary()->NotifyScreenUnlockRequested();
 
   if (login_status_consumer_)
     login_status_consumer_->OnLoginSuccess(username, password,
@@ -363,8 +362,7 @@ void ScreenLocker::Show() {
     // receive the response within timeout. Just send complete
     // signal.
     VLOG(1) << "Show: locker already exists. Just sending completion event.";
-    DBusThreadManager::Get()->GetPowerManagerClient()->
-        NotifyScreenLockCompleted();
+    CrosLibrary::Get()->GetScreenLockLibrary()->NotifyScreenLockCompleted();
   }
 }
 
@@ -418,8 +416,7 @@ ScreenLocker::~ScreenLocker() {
       chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
       content::Source<ScreenLocker>(this),
       content::Details<bool>(&state));
-  DBusThreadManager::Get()->GetPowerManagerClient()->
-      NotifyScreenUnlockCompleted();
+  CrosLibrary::Get()->GetScreenLockLibrary()->NotifyScreenUnlockCompleted();
 }
 
 void ScreenLocker::SetAuthenticator(Authenticator* authenticator) {
@@ -438,8 +435,7 @@ void ScreenLocker::ScreenLockReady() {
       chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
       content::Source<ScreenLocker>(this),
       content::Details<bool>(&state));
-  DBusThreadManager::Get()->GetPowerManagerClient()->
-      NotifyScreenLockCompleted();
+  CrosLibrary::Get()->GetScreenLockLibrary()->NotifyScreenLockCompleted();
 }
 
 }  // namespace chromeos