chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc - Issue 1096293003: Move screenlock_bridge to components/proximity_auth

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc

Issue 1096293003: Move screenlock_bridge to components/proximity_auth (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 5 years, 8 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

« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc ('k') | chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc

diff --git a/chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc b/chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc

index 2846abdb7eb0f743f1abd1df6a72d9a3a091355f..ed1d6f39f4627d511a416a400afaa12ec22507d4 100644

--- a/chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc

+++ b/chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc

@@ -8,9 +8,9 @@

#include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h"

#include "chrome/browser/chromeos/login/users/multi_profile_user_controller_delegate.h"

#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"

-#include "chrome/browser/signin/screenlock_bridge.h"

#include "chrome/test/base/testing_browser_process.h"

#include "chrome/test/base/testing_profile_manager.h"

+#include "components/proximity_auth/screenlock_bridge.h"

#include "components/user_manager/user.h"

#include "testing/gtest/include/gtest/gtest.h"

@@ -68,8 +68,8 @@ class SigninPrepareUserListTest

FakeChromeUserManager* fake_user_manager_;

ScopedUserManagerEnabler user_manager_enabler_;

scoped_ptr<TestingProfileManager> profile_manager_;

- std::map<std::string,

- ScreenlockBridge::LockHandler::AuthType> user_auth_type_map;

+ std::map<std::string, proximity_auth::ScreenlockBridge::LockHandler::AuthType>

+ user_auth_type_map;

scoped_ptr<MultiProfileUserController> controller_;

DISALLOW_COPY_AND_ASSIGN(SigninPrepareUserListTest);