| Index: components/proximity_auth/remote_device_loader.h
|
| diff --git a/components/proximity_auth/remote_device_loader.h b/components/proximity_auth/remote_device_loader.h
|
| index d60cc4b4050e9bf3dc135bdbe6af0af49db99f34..c3b10f82b34566e6774eb706c99a1a66f4a34f58 100644
|
| --- a/components/proximity_auth/remote_device_loader.h
|
| +++ b/components/proximity_auth/remote_device_loader.h
|
| @@ -11,13 +11,16 @@
|
| #include "base/callback.h"
|
| #include "base/macros.h"
|
| #include "base/memory/weak_ptr.h"
|
| -#include "components/proximity_auth/cryptauth/proto/cryptauth_api.pb.h"
|
| +#include "components/cryptauth/proto/cryptauth_api.pb.h"
|
| #include "components/proximity_auth/remote_device.h"
|
|
|
| +namespace cryptauth {
|
| +class SecureMessageDelegate;
|
| +}
|
| +
|
| namespace proximity_auth {
|
|
|
| class ProximityAuthPrefManager;
|
| -class SecureMessageDelegate;
|
|
|
| // Loads a collection of RemoteDevice objects from the given ExternalDeviceInfo
|
| // protos that were synced from CryptAuth. We need to derive the PSK, which is
|
| @@ -34,7 +37,7 @@ class RemoteDeviceLoader {
|
| const std::vector<cryptauth::ExternalDeviceInfo>& unlock_keys,
|
| const std::string& user_id,
|
| const std::string& user_private_key,
|
| - std::unique_ptr<SecureMessageDelegate> secure_message_delegate,
|
| + std::unique_ptr<cryptauth::SecureMessageDelegate> secure_message_delegate,
|
| ProximityAuthPrefManager* pref_manager);
|
|
|
| ~RemoteDeviceLoader();
|
| @@ -59,7 +62,7 @@ class RemoteDeviceLoader {
|
| const std::string user_private_key_;
|
|
|
| // Performs the PSK key derivation.
|
| - std::unique_ptr<SecureMessageDelegate> secure_message_delegate_;
|
| + std::unique_ptr<cryptauth::SecureMessageDelegate> secure_message_delegate_;
|
|
|
| // Used to retrieve the address for BLE devices. Not owned.
|
| ProximityAuthPrefManager* pref_manager_;
|
|
|