Index: chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc |
diff --git a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc |
index 8a199fa4746021668b001aa1930908bf451e76e9..991ceeba8947d20c991d49461a50a89f36600953 100644 |
--- a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc |
+++ b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc |
@@ -29,15 +29,15 @@ |
#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/cryptauth/cryptauth_device_manager.h" |
+#include "components/cryptauth/cryptauth_enrollment_manager.h" |
+#include "components/cryptauth/cryptauth_enrollment_utils.h" |
+#include "components/cryptauth/proto/cryptauth_api.pb.h" |
+#include "components/cryptauth/secure_message_delegate.h" |
#include "components/proximity_auth/ble/bluetooth_low_energy_connection.h" |
#include "components/proximity_auth/ble/bluetooth_low_energy_connection_finder.h" |
#include "components/proximity_auth/bluetooth_throttler_impl.h" |
#include "components/proximity_auth/bluetooth_util.h" |
-#include "components/proximity_auth/cryptauth/cryptauth_device_manager.h" |
-#include "components/proximity_auth/cryptauth/cryptauth_enrollment_manager.h" |
-#include "components/proximity_auth/cryptauth/cryptauth_enrollment_utils.h" |
-#include "components/proximity_auth/cryptauth/proto/cryptauth_api.pb.h" |
-#include "components/proximity_auth/cryptauth/secure_message_delegate.h" |
#include "components/proximity_auth/logging/logging.h" |
#include "components/proximity_auth/proximity_auth_client.h" |
#include "components/proximity_auth/remote_device.h" |
@@ -600,7 +600,7 @@ void EasyUnlockPrivateGetPermitAccessFunction::GetKeyPairForExperiment( |
std::string* user_public_key, |
std::string* user_private_key) { |
Profile* profile = Profile::FromBrowserContext(browser_context()); |
- proximity_auth::CryptAuthEnrollmentManager* enrollment_manager = |
+ cryptauth::CryptAuthEnrollmentManager* enrollment_manager = |
EasyUnlockService::Get(profile) |
->proximity_auth_client() |
->GetCryptAuthEnrollmentManager(); |
@@ -718,7 +718,7 @@ std::string EasyUnlockPrivateGetRemoteDevicesFunction::GetUserPrivateKey() { |
Profile* profile = Profile::FromBrowserContext(browser_context()); |
proximity_auth::ProximityAuthClient* client = |
EasyUnlockService::Get(profile)->proximity_auth_client(); |
- proximity_auth::CryptAuthEnrollmentManager* enrollment_manager = |
+ cryptauth::CryptAuthEnrollmentManager* enrollment_manager = |
client->GetCryptAuthEnrollmentManager(); |
return enrollment_manager->GetUserPrivateKey(); |
} |
@@ -728,7 +728,7 @@ EasyUnlockPrivateGetRemoteDevicesFunction::GetUnlockKeys() { |
Profile* profile = Profile::FromBrowserContext(browser_context()); |
proximity_auth::ProximityAuthClient* client = |
EasyUnlockService::Get(profile)->proximity_auth_client(); |
- proximity_auth::CryptAuthDeviceManager* device_manager = |
+ cryptauth::CryptAuthDeviceManager* device_manager = |
client->GetCryptAuthDeviceManager(); |
return device_manager->unlock_keys(); |
} |
@@ -909,7 +909,7 @@ ExtensionFunction::ResponseAction EasyUnlockPrivateGetUserInfoFunction::Run() { |
EasyUnlockService::GetUserSettings(account_id); |
user.require_close_proximity = user_settings.require_close_proximity; |
- user.device_user_id = proximity_auth::CalculateDeviceUserId( |
+ user.device_user_id = cryptauth::CalculateDeviceUserId( |
EasyUnlockService::GetDeviceId(), account_id.GetUserEmail()); |
user.ble_discovery_enabled = |