chromeos: move screen lock handling to power manager client

chrome/browser/chromeos/login/screen_locker_browsertest.cc

Index: chrome/browser/chromeos/login/screen_locker_browsertest.cc
diff --git a/chrome/browser/chromeos/login/screen_locker_browsertest.cc b/chrome/browser/chromeos/login/screen_locker_browsertest.cc
index d7a7b89786d7d51265604bd50d6f170b2de896d4..bc7a40c50df00a67b0ec81120e366088ac03ec4f 100644
--- a/chrome/browser/chromeos/login/screen_locker_browsertest.cc
+++ b/chrome/browser/chromeos/login/screen_locker_browsertest.cc
@@ -7,7 +7,7 @@
 #include "base/message_loop.h"
 #include "chrome/browser/automation/ui_controls.h"
 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
-#include "chrome/browser/chromeos/cros/mock_screen_lock_library.h"
+#include "chrome/browser/chromeos/dbus/mock_power_manager_client.h"
 #include "chrome/browser/chromeos/login/mock_authenticator.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/chromeos/login/screen_locker_tester.h"
@@ -97,19 +97,19 @@ namespace chromeos {
 
 class ScreenLockerTest : public CrosInProcessBrowserTest {
  public:
-  ScreenLockerTest() : mock_screen_lock_library_(NULL) {
+  ScreenLockerTest() {
   }
 
  protected:
-  MockScreenLockLibrary *mock_screen_lock_library_;
+  MockPowerManagerClient mock_power_manager_client_;
 
   // Test the no password mode with different unlock scheme given by
   // |unlock| function.
   void TestNoPassword(void (unlock)(views::Widget*)) {
-    EXPECT_CALL(*mock_screen_lock_library_, NotifyScreenUnlockRequested())
+    EXPECT_CALL(mock_power_manager_client_, NotifyScreenUnlockRequested())
         .Times(1)
         .RetiresOnSaturation();
-    EXPECT_CALL(*mock_screen_lock_library_, NotifyScreenLockCompleted())
+    EXPECT_CALL(mock_power_manager_client_, NotifyScreenLockCompleted())
         .Times(1)
         .RetiresOnSaturation();
     UserManager::Get()->GuestUserLoggedIn();
@@ -151,12 +151,10 @@ class ScreenLockerTest : public CrosInProcessBrowserTest {
  private:
   virtual void SetUpInProcessBrowserTestFixture() {
     cros_mock_->InitStatusAreaMocks();
-    cros_mock_->InitMockScreenLockLibrary();
-    mock_screen_lock_library_ = cros_mock_->mock_screen_lock_library();
-    EXPECT_CALL(*mock_screen_lock_library_, AddObserver(testing::_))
+    EXPECT_CALL(mock_power_manager_client_, AddObserver(testing::_))
         .Times(1)
         .RetiresOnSaturation();
-    EXPECT_CALL(*mock_screen_lock_library_, NotifyScreenUnlockCompleted())
+    EXPECT_CALL(mock_power_manager_client_, NotifyScreenUnlockCompleted())
         .Times(1)
         .RetiresOnSaturation();
     // Expectations for the status are on the screen lock window.
@@ -176,10 +174,10 @@ class ScreenLockerTest : public CrosInProcessBrowserTest {
 // Temporarily disabling all screen locker tests while investigating the
 // issue crbug.com/78764.
 IN_PROC_BROWSER_TEST_F(ScreenLockerTest, DISABLED_TestBasic) {
-  EXPECT_CALL(*mock_screen_lock_library_, NotifyScreenUnlockRequested())
+  EXPECT_CALL(mock_power_manager_client_, NotifyScreenUnlockRequested())
       .Times(1)
       .RetiresOnSaturation();
-  EXPECT_CALL(*mock_screen_lock_library_, NotifyScreenLockCompleted())
+  EXPECT_CALL(mock_power_manager_client_, NotifyScreenLockCompleted())
       .Times(1)
       .RetiresOnSaturation();
   UserManager::Get()->UserLoggedIn("user");
@@ -217,10 +215,10 @@ IN_PROC_BROWSER_TEST_F(ScreenLockerTest, DISABLED_TestBasic) {
 }
 
 IN_PROC_BROWSER_TEST_F(ScreenLockerTest, DISABLED_TestFullscreenExit) {
-  EXPECT_CALL(*mock_screen_lock_library_, NotifyScreenUnlockRequested())
+  EXPECT_CALL(mock_power_manager_client_, NotifyScreenUnlockRequested())
       .Times(1)
       .RetiresOnSaturation();
-  EXPECT_CALL(*mock_screen_lock_library_, NotifyScreenLockCompleted())
+  EXPECT_CALL(mock_power_manager_client_, NotifyScreenLockCompleted())
       .Times(1)
       .RetiresOnSaturation();
   scoped_ptr<test::ScreenLockerTester> tester(ScreenLocker::GetTester());
@@ -276,7 +274,7 @@ IN_PROC_BROWSER_TEST_F(ScreenLockerTest, DISABLED_TestNoPasswordWithKeyPress) {
 }
 
 IN_PROC_BROWSER_TEST_F(ScreenLockerTest, DISABLED_TestShowTwice) {
-  EXPECT_CALL(*mock_screen_lock_library_, NotifyScreenLockCompleted())
+  EXPECT_CALL(mock_power_manager_client_, NotifyScreenLockCompleted())
       .Times(2)
       .RetiresOnSaturation();
   scoped_ptr<test::ScreenLockerTester> tester(ScreenLocker::GetTester());
@@ -296,7 +294,7 @@ IN_PROC_BROWSER_TEST_F(ScreenLockerTest, DISABLED_TestShowTwice) {
 }
 
 IN_PROC_BROWSER_TEST_F(ScreenLockerTest, DISABLED_TestEscape) {
-  EXPECT_CALL(*mock_screen_lock_library_, NotifyScreenLockCompleted())
+  EXPECT_CALL(mock_power_manager_client_, NotifyScreenLockCompleted())
       .Times(1)
       .RetiresOnSaturation();
   scoped_ptr<test::ScreenLockerTester> tester(ScreenLocker::GetTester());