[EasyUnlock] Observe proximity changes and clean up TX power strategy.

chrome/browser/signin/easy_unlock_service.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/signin/easy_unlock_service.h"
 
 #include <utility>
 
 #include "apps/app_lifetime_monitor.h"
 #include "apps/app_lifetime_monitor_factory.h"
@@ skipping 773 matching lines @@
       case ScreenlockState::PHONE_NOT_AUTHENTICATED:
         return PASSWORD_ENTRY_PHONE_NOT_AUTHENTICATED;
       case ScreenlockState::PHONE_LOCKED:
         return PASSWORD_ENTRY_PHONE_LOCKED;
       case ScreenlockState::PHONE_NOT_LOCKABLE:
         return PASSWORD_ENTRY_PHONE_NOT_LOCKABLE;
       case ScreenlockState::PHONE_UNSUPPORTED:
         return PASSWORD_ENTRY_PHONE_UNSUPPORTED;
       case ScreenlockState::RSSI_TOO_LOW:
         return PASSWORD_ENTRY_RSSI_TOO_LOW;
-      case ScreenlockState::TX_POWER_TOO_HIGH:
-        return PASSWORD_ENTRY_TX_POWER_TOO_HIGH;
-      case ScreenlockState::PHONE_LOCKED_AND_TX_POWER_TOO_HIGH:
-        return PASSWORD_ENTRY_PHONE_LOCKED_AND_TX_POWER_TOO_HIGH;
+      case ScreenlockState::PHONE_LOCKED_AND_RSSI_TOO_LOW:
+        return PASSWORD_ENTRY_PHONE_LOCKED_AND_RSSI_TOO_LOW;
       case ScreenlockState::AUTHENTICATED:
         return PASSWORD_ENTRY_WITH_AUTHENTICATED_PHONE;
     }
   }
 
   NOTREACHED();
   return EASY_UNLOCK_AUTH_EVENT_COUNT;
 }
 
 void EasyUnlockService::SetProximityAuthDevices(
@@ skipping 73 matching lines @@
 
   // TODO(tbarzic): Set check_private_key only if previous sign-in attempt
   // failed.
   EasyUnlockTpmKeyManagerFactory::GetInstance()->Get(profile_)
       ->PrepareTpmKey(true /* check_private_key */,
                       base::Closure());
 #endif  // defined(OS_CHROMEOS)
 
   tpm_key_checked_ = true;
 }