Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(450)

Unified Diff: chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc

Issue 296773002: Add a Key class (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc
diff --git a/chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc b/chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc
index 3a083f3a28dc27b440a86b5348bd1167cea25c5a..2094c3cf791ff52e9d1a84d9011b7b1722c3eafc 100644
--- a/chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc
+++ b/chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc
@@ -9,7 +9,9 @@
#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
#include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/chromeos/login/auth/key.h"
#include "chrome/browser/chromeos/login/auth/mock_authenticator.h"
+#include "chrome/browser/chromeos/login/auth/user_context.h"
#include "chrome/browser/chromeos/login/lock/screen_locker_tester.h"
#include "chrome/browser/chromeos/login/users/user_manager.h"
#include "chrome/browser/profiles/profile_manager.h"
@@ -156,7 +158,9 @@ IN_PROC_BROWSER_TEST_F(ScreenLockerTest, TestBasic) {
EXPECT_GT(lock_bounds.width(), 10);
EXPECT_GT(lock_bounds.height(), 10);
- tester->InjectMockAuthenticator(UserManager::kStubUser, "pass");
+ UserContext user_context(UserManager::kStubUser);
+ user_context.SetKey(Key("pass"));
+ tester->InjectMockAuthenticator(user_context);
EXPECT_TRUE(tester->IsLocked());
tester->EnterPassword("fail");
content::RunAllPendingInMessageLoop();
@@ -200,7 +204,9 @@ IN_PROC_BROWSER_TEST_F(ScreenLockerTest, TestFullscreenExit) {
EXPECT_FALSE(window_state->hide_shelf_when_fullscreen());
EXPECT_TRUE(tester->IsLocked());
}
- tester->InjectMockAuthenticator(UserManager::kStubUser, "pass");
+ UserContext user_context(UserManager::kStubUser);
+ user_context.SetKey(Key("pass"));
+ tester->InjectMockAuthenticator(user_context);
tester->EnterPassword("pass");
content::RunAllPendingInMessageLoop();
EXPECT_FALSE(tester->IsLocked());
@@ -234,7 +240,6 @@ IN_PROC_BROWSER_TEST_F(ScreenLockerTest, TestFullscreenExit) {
EXPECT_TRUE(tester->IsLocked());
}
- tester->InjectMockAuthenticator(UserManager::kStubUser, "pass");
tester->EnterPassword("pass");
content::RunAllPendingInMessageLoop();
EXPECT_FALSE(tester->IsLocked());
« no previous file with comments | « chrome/browser/chromeos/login/lock/screen_locker.cc ('k') | chrome/browser/chromeos/login/lock/screen_locker_tester.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698