| Index: chrome/browser/signin/easy_unlock_service_regular.h
|
| diff --git a/chrome/browser/signin/easy_unlock_service_regular.h b/chrome/browser/signin/easy_unlock_service_regular.h
|
| index 50859a9ef0ab4742846e7788c57aff6aec07eeef..2aceaeefb43dc3bf5e63a582015f0c6c19a791ea 100644
|
| --- a/chrome/browser/signin/easy_unlock_service_regular.h
|
| +++ b/chrome/browser/signin/easy_unlock_service_regular.h
|
| @@ -13,8 +13,8 @@
|
| #include "base/time/time.h"
|
| #include "build/build_config.h"
|
| #include "chrome/browser/signin/easy_unlock_service.h"
|
| +#include "components/cryptauth/cryptauth_device_manager.h"
|
| #include "components/prefs/pref_change_registrar.h"
|
| -#include "components/proximity_auth/cryptauth/cryptauth_device_manager.h"
|
| #include "components/proximity_auth/screenlock_bridge.h"
|
| #include "google_apis/gaia/oauth2_token_service.h"
|
|
|
| @@ -28,14 +28,14 @@ class ListValue;
|
| }
|
|
|
| namespace cryptauth {
|
| -class ToggleEasyUnlockResponse;
|
| -}
|
| -
|
| -namespace proximity_auth {
|
| class CryptAuthClient;
|
| class CryptAuthDeviceManager;
|
| class CryptAuthEnrollmentManager;
|
| class CryptAuthGCMManager;
|
| +class ToggleEasyUnlockResponse;
|
| +}
|
| +
|
| +namespace proximity_auth {
|
| class ProximityAuthPrefManager;
|
| class RemoteDeviceLoader;
|
| }
|
| @@ -49,7 +49,7 @@ class Profile;
|
| class EasyUnlockServiceRegular
|
| : public EasyUnlockService,
|
| public proximity_auth::ScreenlockBridge::Observer,
|
| - public proximity_auth::CryptAuthDeviceManager::Observer,
|
| + public cryptauth::CryptAuthDeviceManager::Observer,
|
| public OAuth2TokenService::Observer {
|
| public:
|
| explicit EasyUnlockServiceRegular(Profile* profile);
|
| @@ -57,11 +57,11 @@ class EasyUnlockServiceRegular
|
|
|
| // Returns the CryptAuthEnrollmentManager, which manages the profile's
|
| // CryptAuth enrollment.
|
| - proximity_auth::CryptAuthEnrollmentManager* GetCryptAuthEnrollmentManager();
|
| + cryptauth::CryptAuthEnrollmentManager* GetCryptAuthEnrollmentManager();
|
|
|
| // Returns the CryptAuthEnrollmentManager, which manages the profile's
|
| // synced devices from CryptAuth.
|
| - proximity_auth::CryptAuthDeviceManager* GetCryptAuthDeviceManager();
|
| + cryptauth::CryptAuthDeviceManager* GetCryptAuthDeviceManager();
|
|
|
| // Returns the ProximityAuthPrefManager, which manages the profile's
|
| // prefs for proximity_auth classes.
|
| @@ -107,8 +107,8 @@ class EasyUnlockServiceRegular
|
|
|
| // CryptAuthDeviceManager::Observer:
|
| void OnSyncFinished(
|
| - proximity_auth::CryptAuthDeviceManager::SyncResult sync_result,
|
| - proximity_auth::CryptAuthDeviceManager::DeviceChangeResult
|
| + cryptauth::CryptAuthDeviceManager::SyncResult sync_result,
|
| + cryptauth::CryptAuthDeviceManager::DeviceChangeResult
|
| device_change_result) override;
|
|
|
| // proximity_auth::ScreenlockBridge::Observer implementation:
|
| @@ -158,7 +158,7 @@ class EasyUnlockServiceRegular
|
| PrefChangeRegistrar registrar_;
|
|
|
| TurnOffFlowStatus turn_off_flow_status_;
|
| - std::unique_ptr<proximity_auth::CryptAuthClient> cryptauth_client_;
|
| + std::unique_ptr<cryptauth::CryptAuthClient> cryptauth_client_;
|
|
|
| AutoPairingResultCallback auto_pairing_callback_;
|
|
|
| @@ -175,10 +175,10 @@ class EasyUnlockServiceRegular
|
|
|
| // Managers responsible for handling syncing and communications with
|
| // CryptAuth.
|
| - std::unique_ptr<proximity_auth::CryptAuthGCMManager> gcm_manager_;
|
| - std::unique_ptr<proximity_auth::CryptAuthEnrollmentManager>
|
| + std::unique_ptr<cryptauth::CryptAuthGCMManager> gcm_manager_;
|
| + std::unique_ptr<cryptauth::CryptAuthEnrollmentManager>
|
| enrollment_manager_;
|
| - std::unique_ptr<proximity_auth::CryptAuthDeviceManager> device_manager_;
|
| + std::unique_ptr<cryptauth::CryptAuthDeviceManager> device_manager_;
|
|
|
| // Manager responsible for handling the prefs used by proximity_auth classes.
|
| std::unique_ptr<proximity_auth::ProximityAuthPrefManager> pref_manager_;
|
|
|