| Index: chrome/browser/signin/easy_unlock_service.cc
|
| diff --git a/chrome/browser/signin/easy_unlock_service.cc b/chrome/browser/signin/easy_unlock_service.cc
|
| index 52492dfacc2450cb834532cee4195305c3787ebf..dc8b50bc274a725ee0d25f74dd67c6467b79f848 100644
|
| --- a/chrome/browser/signin/easy_unlock_service.cc
|
| +++ b/chrome/browser/signin/easy_unlock_service.cc
|
| @@ -31,14 +31,14 @@
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/extensions/extension_constants.h"
|
| #include "chrome/common/pref_names.h"
|
| +#include "components/cryptauth/cryptauth_client_impl.h"
|
| +#include "components/cryptauth/cryptauth_device_manager.h"
|
| +#include "components/cryptauth/cryptauth_enrollment_manager.h"
|
| +#include "components/cryptauth/secure_message_delegate.h"
|
| #include "components/pref_registry/pref_registry_syncable.h"
|
| #include "components/prefs/pref_registry_simple.h"
|
| #include "components/prefs/pref_service.h"
|
| #include "components/prefs/scoped_user_pref_update.h"
|
| -#include "components/proximity_auth/cryptauth/cryptauth_client_impl.h"
|
| -#include "components/proximity_auth/cryptauth/cryptauth_device_manager.h"
|
| -#include "components/proximity_auth/cryptauth/cryptauth_enrollment_manager.h"
|
| -#include "components/proximity_auth/cryptauth/secure_message_delegate.h"
|
| #include "components/proximity_auth/logging/logging.h"
|
| #include "components/proximity_auth/proximity_auth_pref_manager.h"
|
| #include "components/proximity_auth/proximity_auth_system.h"
|
| @@ -287,9 +287,9 @@ void EasyUnlockService::RegisterProfilePrefs(
|
| false,
|
| user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
|
|
|
| - proximity_auth::CryptAuthGCMManager::RegisterPrefs(registry);
|
| - proximity_auth::CryptAuthDeviceManager::RegisterPrefs(registry);
|
| - proximity_auth::CryptAuthEnrollmentManager::RegisterPrefs(registry);
|
| + cryptauth::CryptAuthGCMManager::RegisterPrefs(registry);
|
| + cryptauth::CryptAuthDeviceManager::RegisterPrefs(registry);
|
| + cryptauth::CryptAuthEnrollmentManager::RegisterPrefs(registry);
|
|
|
| if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| proximity_auth::switches::kEnableBluetoothLowEnergyDiscovery))
|
|
|