[Smart Lock] Extract the screenlock state to the proximity_auth component.

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 <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/memory/linked_ptr.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_crypto_delegate.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/easy_unlock_screenlock_state_handler.h"
 #include "chrome/browser/signin/easy_unlock_service.h"
 #include "chrome/browser/ui/proximity_auth/proximity_auth_error_bubble.h"
 #include "chrome/common/extensions/api/easy_unlock_private.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/proximity_auth/bluetooth_util.h"
 #include "components/proximity_auth/cryptauth/cryptauth_enrollment_utils.h"
 #include "components/proximity_auth/screenlock_bridge.h"
+#include "components/proximity_auth/screenlock_state.h"
 #include "components/proximity_auth/switches.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/browser_context_keyed_api_factory.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/range/range.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/chromeos_utils.h"
 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager.h"
 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_manager.h"
 #endif
 
+using proximity_auth::ScreenlockState;
+
 namespace extensions {
 namespace api {
 
 namespace {
 
 static base::LazyInstance<BrowserContextKeyedAPIFactory<EasyUnlockPrivateAPI> >
     g_factory = LAZY_INSTANCE_INITIALIZER;
 
 // Utility method for getting the API's crypto delegate.
 EasyUnlockPrivateCryptoDelegate* GetCryptoDelegate(
     content::BrowserContext* context) {
   return BrowserContextKeyedAPIFactory<EasyUnlockPrivateAPI>::Get(context)
              ->crypto_delegate();
 }
 
-EasyUnlockScreenlockStateHandler::State ToScreenlockStateHandlerState(
-    easy_unlock_private::State state) {
+ScreenlockState ToScreenlockState(easy_unlock_private::State state) {
   switch (state) {
     case easy_unlock_private::STATE_NO_BLUETOOTH:
-      return EasyUnlockScreenlockStateHandler::STATE_NO_BLUETOOTH;
+      return ScreenlockState::NO_BLUETOOTH;
     case easy_unlock_private::STATE_BLUETOOTH_CONNECTING:
-      return EasyUnlockScreenlockStateHandler::STATE_BLUETOOTH_CONNECTING;
+      return ScreenlockState::BLUETOOTH_CONNECTING;
     case easy_unlock_private::STATE_NO_PHONE:
-      return EasyUnlockScreenlockStateHandler::STATE_NO_PHONE;
+      return ScreenlockState::NO_PHONE;
     case easy_unlock_private::STATE_PHONE_NOT_AUTHENTICATED:
-      return EasyUnlockScreenlockStateHandler::STATE_PHONE_NOT_AUTHENTICATED;
+      return ScreenlockState::PHONE_NOT_AUTHENTICATED;
     case easy_unlock_private::STATE_PHONE_LOCKED:
-      return EasyUnlockScreenlockStateHandler::STATE_PHONE_LOCKED;
+      return ScreenlockState::PHONE_LOCKED;
     case easy_unlock_private::STATE_PHONE_UNLOCKABLE:
-      return EasyUnlockScreenlockStateHandler::STATE_PHONE_UNLOCKABLE;
+      return ScreenlockState::PHONE_NOT_LOCKABLE;
     case easy_unlock_private::STATE_PHONE_UNSUPPORTED:
-      return EasyUnlockScreenlockStateHandler::STATE_PHONE_UNSUPPORTED;
+      return ScreenlockState::PHONE_UNSUPPORTED;
     case easy_unlock_private::STATE_RSSI_TOO_LOW:
-      return EasyUnlockScreenlockStateHandler::STATE_RSSI_TOO_LOW;
+      return ScreenlockState::RSSI_TOO_LOW;
     case easy_unlock_private::STATE_TX_POWER_TOO_HIGH:
-      return EasyUnlockScreenlockStateHandler::STATE_TX_POWER_TOO_HIGH;
+      return ScreenlockState::TX_POWER_TOO_HIGH;
     case easy_unlock_private::STATE_PHONE_LOCKED_AND_TX_POWER_TOO_HIGH:
-      return EasyUnlockScreenlockStateHandler::
-                 STATE_PHONE_LOCKED_AND_TX_POWER_TOO_HIGH;
+      return ScreenlockState::PHONE_LOCKED_AND_TX_POWER_TOO_HIGH;
     case easy_unlock_private::STATE_AUTHENTICATED:
-      return EasyUnlockScreenlockStateHandler::STATE_AUTHENTICATED;
+      return ScreenlockState::AUTHENTICATED;
     default:
-      return EasyUnlockScreenlockStateHandler::STATE_INACTIVE;
+      return ScreenlockState::INACTIVE;
   }
 }
 
 }  // namespace
 
 // static
 BrowserContextKeyedAPIFactory<EasyUnlockPrivateAPI>*
     EasyUnlockPrivateAPI::GetFactoryInstance() {
   return g_factory.Pointer();
 }
@@ skipping 407 matching lines @@
 EasyUnlockPrivateUpdateScreenlockStateFunction::
     ~EasyUnlockPrivateUpdateScreenlockStateFunction() {}
 
 bool EasyUnlockPrivateUpdateScreenlockStateFunction::RunSync() {
   scoped_ptr<easy_unlock_private::UpdateScreenlockState::Params> params(
       easy_unlock_private::UpdateScreenlockState::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   Profile* profile = Profile::FromBrowserContext(browser_context());
   if (EasyUnlockService::Get(profile)->UpdateScreenlockState(
-          ToScreenlockStateHandlerState(params->state)))
+          ToScreenlockState(params->state)))
     return true;
 
   SetError("Not allowed");
   return false;
 }
 
 EasyUnlockPrivateSetPermitAccessFunction::
     EasyUnlockPrivateSetPermitAccessFunction() {
 }
 
@@ skipping 307 matching lines @@
 
   Profile* profile = Profile::FromBrowserContext(browser_context());
   EasyUnlockService::Get(profile)
       ->SetAutoPairingResult(params->result.success, error_message);
 
   return true;
 }
 
 }  // namespace api
 }  // namespace extensions