Rename ScreelockBridge to SigninScreenBridge

chrome/browser/chromeos/login/screens/user_selection_screen.cc

Index: chrome/browser/chromeos/login/screens/user_selection_screen.cc
diff --git a/chrome/browser/chromeos/login/screens/user_selection_screen.cc b/chrome/browser/chromeos/login/screens/user_selection_screen.cc
index cce4b80ec15c9805ed64a201c5f8f52e62d67743..2d12aaab9269175c910cb5b67dc8b7dd79d6251e 100644
--- a/chrome/browser/chromeos/login/screens/user_selection_screen.cc
+++ b/chrome/browser/chromeos/login/screens/user_selection_screen.cc
@@ -15,7 +15,7 @@
 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
-#include "chrome/browser/signin/screenlock_bridge.h"
+#include "chrome/browser/signin/signin_screen_bridge.h"
 #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h"
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 #include "chrome/common/pref_names.h"
@@ -121,7 +121,7 @@ void UserSelectionScreen::FillUserDictionary(
     user_manager::User* user,
     bool is_owner,
     bool is_signin_to_add,
-    ScreenlockBridge::LockHandler::AuthType auth_type,
+    SigninScreenBridge::LockHandler::AuthType auth_type,
     const std::vector<std::string>* public_session_recommended_locales,
     base::DictionaryValue* user_dict) {
   const std::string& user_id = user->email();
@@ -284,7 +284,6 @@ const user_manager::UserList UserSelectionScreen::PrepareUserListForSending(
 
     if ((is_public_account && !is_signin_to_add) || is_owner ||
         (!is_public_account && non_owner_count < max_non_owner_users)) {
-
       if (!is_owner)
         ++non_owner_count;
       if (is_owner && users_to_send.size() > kMaxUsers) {
@@ -329,12 +328,12 @@ void UserSelectionScreen::SendUserList() {
     bool is_owner = (user_id == owner);
     const bool is_public_account =
         ((*it)->GetType() == user_manager::USER_TYPE_PUBLIC_ACCOUNT);
-    const ScreenlockBridge::LockHandler::AuthType initial_auth_type =
+    const SigninScreenBridge::LockHandler::AuthType initial_auth_type =
         is_public_account
-            ? ScreenlockBridge::LockHandler::EXPAND_THEN_USER_CLICK
+            ? SigninScreenBridge::LockHandler::EXPAND_THEN_USER_CLICK
             : (ShouldForceOnlineSignIn(*it)
-                   ? ScreenlockBridge::LockHandler::ONLINE_SIGN_IN
-                   : ScreenlockBridge::LockHandler::OFFLINE_PASSWORD);
+                   ? SigninScreenBridge::LockHandler::ONLINE_SIGN_IN
+                   : SigninScreenBridge::LockHandler::OFFLINE_PASSWORD);
     user_auth_type_map_[user_id] = initial_auth_type;
 
     base::DictionaryValue* user_dict = new base::DictionaryValue();
@@ -369,17 +368,17 @@ void UserSelectionScreen::HandleGetUsers() {
 
 void UserSelectionScreen::SetAuthType(
     const std::string& username,
-    ScreenlockBridge::LockHandler::AuthType auth_type) {
+    SigninScreenBridge::LockHandler::AuthType auth_type) {
   DCHECK(GetAuthType(username) !=
-             ScreenlockBridge::LockHandler::FORCE_OFFLINE_PASSWORD ||
-         auth_type == ScreenlockBridge::LockHandler::FORCE_OFFLINE_PASSWORD);
+             SigninScreenBridge::LockHandler::FORCE_OFFLINE_PASSWORD ||
+         auth_type == SigninScreenBridge::LockHandler::FORCE_OFFLINE_PASSWORD);
   user_auth_type_map_[username] = auth_type;
 }
 
-ScreenlockBridge::LockHandler::AuthType UserSelectionScreen::GetAuthType(
+SigninScreenBridge::LockHandler::AuthType UserSelectionScreen::GetAuthType(
     const std::string& username) const {
   if (user_auth_type_map_.find(username) == user_auth_type_map_.end())
-    return ScreenlockBridge::LockHandler::OFFLINE_PASSWORD;
+    return SigninScreenBridge::LockHandler::OFFLINE_PASSWORD;
   return user_auth_type_map_.find(username)->second;
 }