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 87b5aeb0c6aeb717b672035e5c49f75dab112df6..df3c0a70ef51da57d4d864ad7ffcec7199b310c4 100644 |
--- a/chrome/browser/chromeos/login/screen_locker_browsertest.cc |
+++ b/chrome/browser/chromeos/login/screen_locker_browsertest.cc |
@@ -159,17 +159,13 @@ IN_PROC_BROWSER_TEST_F(ScreenLockerTest, TestBasic) { |
EXPECT_TRUE(tester->IsLocked()); |
tester->EnterPassword("pass"); |
content::RunAllPendingInMessageLoop(); |
- // Successful authentication simply send a unlock request to PowerManager. |
- EXPECT_TRUE(tester->IsLocked()); |
+ // Successful authentication clears the lock screen and tells the |
+ // SessionManager to announce this over DBus. |
+ EXPECT_FALSE(tester->IsLocked()); |
EXPECT_EQ( |
1, |
fake_session_manager_client_->notify_lock_screen_shown_call_count()); |
- // Emulate LockScreen request from SessionManager. |
- // TODO(oshima): Find out better way to handle this in mock. |
- ScreenLocker::Hide(); |
- content::RunAllPendingInMessageLoop(); |
- EXPECT_FALSE(tester->IsLocked()); |
EXPECT_TRUE(VerifyLockScreenDismissed()); |
} |
@@ -197,8 +193,6 @@ IN_PROC_BROWSER_TEST_F(ScreenLockerTest, TestFullscreenExit) { |
tester->InjectMockAuthenticator(UserManager::kStubUser, "pass"); |
tester->EnterPassword("pass"); |
content::RunAllPendingInMessageLoop(); |
- ScreenLocker::Hide(); |
- content::RunAllPendingInMessageLoop(); |
EXPECT_FALSE(tester->IsLocked()); |
EXPECT_TRUE(VerifyLockScreenDismissed()); |
} |