Rename ScreelockBridge to SigninScreenBridge

chrome/browser/signin/easy_unlock_screenlock_state_handler.cc

Index: chrome/browser/signin/easy_unlock_screenlock_state_handler.cc
diff --git a/chrome/browser/signin/easy_unlock_screenlock_state_handler.cc b/chrome/browser/signin/easy_unlock_screenlock_state_handler.cc
index f2eb9ee0f914108946c4365121831e723379abac..c19848ac4b76d88933b3e8538aa45a2119f66a94 100644
--- a/chrome/browser/signin/easy_unlock_screenlock_state_handler.cc
+++ b/chrome/browser/signin/easy_unlock_screenlock_state_handler.cc
@@ -82,17 +82,17 @@ bool TooltipContainsDeviceType(EasyUnlockScreenlockStateHandler::State state) {
 EasyUnlockScreenlockStateHandler::EasyUnlockScreenlockStateHandler(
     const std::string& user_email,
     PrefService* pref_service,
-    ScreenlockBridge* screenlock_bridge)
+    SigninScreenBridge* signin_screen_bridge)
     : state_(STATE_INACTIVE),
       user_email_(user_email),
       pref_service_(pref_service),
-      screenlock_bridge_(screenlock_bridge) {
-  DCHECK(screenlock_bridge_);
-  screenlock_bridge_->AddObserver(this);
+      signin_screen_bridge_(signin_screen_bridge) {
+  DCHECK(signin_screen_bridge_);
+  signin_screen_bridge_->AddObserver(this);
 }
 
 EasyUnlockScreenlockStateHandler::~EasyUnlockScreenlockStateHandler() {
-  screenlock_bridge_->RemoveObserver(this);
+  signin_screen_bridge_->RemoveObserver(this);
   // Make sure the screenlock state set by this gets cleared.
   ChangeState(STATE_INACTIVE);
 }
@@ -105,19 +105,19 @@ void EasyUnlockScreenlockStateHandler::ChangeState(State new_state) {
 
   // If lock screen is not active or it forces offline password, just cache the
   // current state. The screenlock state will get refreshed in |ScreenDidLock|.
-  if (!screenlock_bridge_->IsLocked() ||
-      screenlock_bridge_->lock_handler()->GetAuthType(user_email_) ==
-          ScreenlockBridge::LockHandler::FORCE_OFFLINE_PASSWORD) {
+  if (!signin_screen_bridge_->IsLocked() ||
+      signin_screen_bridge_->lock_handler()->GetAuthType(user_email_) ==
+          SigninScreenBridge::LockHandler::FORCE_OFFLINE_PASSWORD) {
     return;
   }
 
   UpdateScreenlockAuthType();
 
-  ScreenlockBridge::UserPodCustomIconOptions icon_options;
+  SigninScreenBridge::UserPodCustomIconOptions icon_options;
 
   std::string icon_url = GetIconURLForState(state_);
   if (icon_url.empty()) {
-    screenlock_bridge_->lock_handler()->HideUserPodCustomIcon(user_email_);
+    signin_screen_bridge_->lock_handler()->HideUserPodCustomIcon(user_email_);
     return;
   }
   icon_options.SetIconAsResourceURL(icon_url);
@@ -138,7 +138,7 @@ void EasyUnlockScreenlockStateHandler::ChangeState(State new_state) {
   if (trial_run && state_ == STATE_AUTHENTICATED)
     MarkTrialRunComplete();
 
-  screenlock_bridge_->lock_handler()->ShowUserPodCustomIcon(user_email_,
+  signin_screen_bridge_->lock_handler()->ShowUserPodCustomIcon(user_email_,
                                                             icon_options);
 }
 
@@ -158,7 +158,7 @@ void EasyUnlockScreenlockStateHandler::OnFocusedUserChanged(
 
 void EasyUnlockScreenlockStateHandler::UpdateTooltipOptions(
     bool trial_run,
-    ScreenlockBridge::UserPodCustomIconOptions* icon_options) {
+    SigninScreenBridge::UserPodCustomIconOptions* icon_options) {
   size_t resource_id = 0;
   base::string16 device_name;
   if (trial_run && state_ == STATE_AUTHENTICATED) {
@@ -208,21 +208,21 @@ base::string16 EasyUnlockScreenlockStateHandler::GetDeviceName() {
 }
 
 void EasyUnlockScreenlockStateHandler::UpdateScreenlockAuthType() {
-  if (screenlock_bridge_->lock_handler()->GetAuthType(user_email_) ==
-          ScreenlockBridge::LockHandler::FORCE_OFFLINE_PASSWORD)
+  if (signin_screen_bridge_->lock_handler()->GetAuthType(user_email_) ==
+          SigninScreenBridge::LockHandler::FORCE_OFFLINE_PASSWORD)
     return;
 
   if (state_ == STATE_AUTHENTICATED) {
-    screenlock_bridge_->lock_handler()->SetAuthType(
+    signin_screen_bridge_->lock_handler()->SetAuthType(
         user_email_,
-        ScreenlockBridge::LockHandler::USER_CLICK,
+        SigninScreenBridge::LockHandler::USER_CLICK,
         l10n_util::GetStringUTF16(
             IDS_EASY_UNLOCK_SCREENLOCK_USER_POD_AUTH_VALUE));
-  } else if (screenlock_bridge_->lock_handler()->GetAuthType(user_email_) !=
-                 ScreenlockBridge::LockHandler::OFFLINE_PASSWORD) {
-    screenlock_bridge_->lock_handler()->SetAuthType(
+  } else if (signin_screen_bridge_->lock_handler()->GetAuthType(user_email_) !=
+                 SigninScreenBridge::LockHandler::OFFLINE_PASSWORD) {
+    signin_screen_bridge_->lock_handler()->SetAuthType(
         user_email_,
-        ScreenlockBridge::LockHandler::OFFLINE_PASSWORD,
+        SigninScreenBridge::LockHandler::OFFLINE_PASSWORD,
         base::string16());
   }
 }