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

chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.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/extensions/api/easy_unlock_private/easy_unlock_private_api.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/base64url.h"
@@ skipping 82 matching lines @@
       return ScreenlockState::NO_PHONE;
     case easy_unlock_private::STATE_PHONE_NOT_AUTHENTICATED:
       return ScreenlockState::PHONE_NOT_AUTHENTICATED;
     case easy_unlock_private::STATE_PHONE_LOCKED:
       return ScreenlockState::PHONE_LOCKED;
     case easy_unlock_private::STATE_PHONE_UNLOCKABLE:
       return ScreenlockState::PHONE_NOT_LOCKABLE;
     case easy_unlock_private::STATE_PHONE_UNSUPPORTED:
       return ScreenlockState::PHONE_UNSUPPORTED;
     case easy_unlock_private::STATE_RSSI_TOO_LOW:
+    case easy_unlock_private::STATE_TX_POWER_TOO_HIGH:
+      // Note: TX Power is deprecated, so we merge it with the RSSI state.
       return ScreenlockState::RSSI_TOO_LOW;
-    case easy_unlock_private::STATE_TX_POWER_TOO_HIGH:
-      return ScreenlockState::TX_POWER_TOO_HIGH;
     case easy_unlock_private::STATE_PHONE_LOCKED_AND_TX_POWER_TOO_HIGH:
-      return ScreenlockState::PHONE_LOCKED_AND_TX_POWER_TOO_HIGH;
+      return ScreenlockState::PHONE_LOCKED_AND_RSSI_TOO_LOW;
     case easy_unlock_private::STATE_AUTHENTICATED:
       return ScreenlockState::AUTHENTICATED;
     default:
       return ScreenlockState::INACTIVE;
   }
 }
 
 }  // namespace
 
 // static
@@ skipping 1056 matching lines @@
       GetConnectionManager(browser_context())
           ->GetDeviceAddress(extension(), params->connection_id);
   if (device_address.empty())
     return RespondNow(Error("Invalid connectionId."));
   return RespondNow(ArgumentList(
       easy_unlock_private::SetupConnectionGetDeviceAddress::Results::Create(
           device_address)));
 }
 
 }  // namespace extensions