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

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

Issue 592893002: Rename ScreelockBridge to SigninScreenBridge Base URL: https://chromium.googlesource.com/chromium/src.git@easy_signin_auth_handler
Patch Set: Created 6 years, 3 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/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 7264143347ddcc022d4deeaf88a9b5841653975f..a96a73c475317732df0cff1e2ae2932f5638577b 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc
@@ -8,7 +8,7 @@
#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/browser/signin/signin_screen_bridge.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile_manager.h"
#include "components/user_manager/user.h"
@@ -16,7 +16,7 @@
namespace {
-const size_t kMaxUsers = 18; // same as in user_selection_screen.cc
+const size_t kMaxUsers = 18; // same as in user_selection_screen.cc
const char* kOwner = "owner@gmail.com";
const char* kUsersPublic[] = {"public0@gmail.com", "public1@gmail.com"};
const char* kUsers[] = {
@@ -72,9 +72,10 @@ class SigninPrepareUserListTest
ScopedUserManagerEnabler user_manager_enabler_;
scoped_ptr<TestingProfileManager> profile_manager_;
std::map<std::string,
- ScreenlockBridge::LockHandler::AuthType> user_auth_type_map;
+ SigninScreenBridge::LockHandler::AuthType> user_auth_type_map;
scoped_ptr<MultiProfileUserController> controller_;
+ private:
DISALLOW_COPY_AND_ASSIGN(SigninPrepareUserListTest);
};

Powered by Google App Engine
This is Rietveld 408576698