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

chrome/browser/chromeos/login/login_performer.cc

 // Copyright (c) 2011 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/login_performer.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/boot_times_loader.h"
+#include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/browser/chromeos/cros/screen_lock_library.h"
 #include "chrome/browser/chromeos/cros_settings.h"
 #include "chrome/browser/chromeos/cros_settings_names.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/power_manager_client.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/user_metrics.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 329 matching lines @@
   DVLOG(1) << "Screen lock requested";
   // Will receive notifications on screen unlock and delete itself.
   registrar_.Add(this,
                  chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
                  content::NotificationService::AllSources());
   if (ScreenLocker::default_screen_locker()) {
     DVLOG(1) << "Screen already locked";
     ResolveScreenLocked();
   } else {
     screen_lock_requested_ = true;
-    DBusThreadManager::Get()->GetPowerManagerClient()->
+    chromeos::CrosLibrary::Get()->GetScreenLockLibrary()->
         NotifyScreenLockRequested();
   }
 }
 
 void LoginPerformer::RequestScreenUnlock() {
   DVLOG(1) << "Screen unlock requested";
   if (ScreenLocker::default_screen_locker()) {
-    DBusThreadManager::Get()->GetPowerManagerClient()->
+    chromeos::CrosLibrary::Get()->GetScreenLockLibrary()->
         NotifyScreenUnlockRequested();
     // Will unsubscribe from notifications once unlock is successful.
   } else {
     LOG(ERROR) << "Screen is not locked";
     NOTREACHED();
   }
 }
 
 void LoginPerformer::ResolveInitialNetworkAuthFailure() {
   DVLOG(1) << "auth_error: " << last_login_failure_.error().state();
@@ skipping 156 matching lines @@
                    profile,
                    username_,
                    password_,
                    captcha_token_,
                    captcha_));
   }
   password_.clear();
 }
 
 }  // namespace chromeos