Index: components/proximity_auth/proximity_auth_client.h |
diff --git a/components/proximity_auth/proximity_auth_client.h b/components/proximity_auth/proximity_auth_client.h |
index ae2c340bdae2b7e8403c3d2691140162ccaac4e0..807f16343a85f7e4e08e9937ba524d5ea834d374 100644 |
--- a/components/proximity_auth/proximity_auth_client.h |
+++ b/components/proximity_auth/proximity_auth_client.h |
@@ -9,17 +9,19 @@ |
#include <string> |
#include "base/callback_forward.h" |
-#include "components/proximity_auth/cryptauth/proto/cryptauth_api.pb.h" |
+#include "components/cryptauth/proto/cryptauth_api.pb.h" |
#include "components/proximity_auth/screenlock_state.h" |
class PrefService; |
-namespace proximity_auth { |
- |
+namespace cryptauth { |
class CryptAuthClientFactory; |
class CryptAuthDeviceManager; |
class CryptAuthEnrollmentManager; |
class SecureMessageDelegate; |
+} |
+ |
+namespace proximity_auth { |
// An interface that needs to be supplied to the Proximity Auth component by its |
// embedder. There should be one |ProximityAuthClient| per |
@@ -59,11 +61,11 @@ class ProximityAuthClient { |
virtual PrefService* GetPrefService() = 0; |
// Returns the SecureMessageDelegate used by the system. |
- virtual std::unique_ptr<SecureMessageDelegate> |
+ virtual std::unique_ptr<cryptauth::SecureMessageDelegate> |
CreateSecureMessageDelegate() = 0; |
// Constructs the CryptAuthClientFactory that can be used for API requests. |
- virtual std::unique_ptr<CryptAuthClientFactory> |
+ virtual std::unique_ptr<cryptauth::CryptAuthClientFactory> |
CreateCryptAuthClientFactory() = 0; |
// Constructs the DeviceClassifier message that is sent to CryptAuth for all |
@@ -73,11 +75,10 @@ class ProximityAuthClient { |
// Returns the account id of the user. |
virtual std::string GetAccountId() = 0; |
- virtual proximity_auth::CryptAuthEnrollmentManager* |
+ virtual cryptauth::CryptAuthEnrollmentManager* |
GetCryptAuthEnrollmentManager() = 0; |
- virtual proximity_auth::CryptAuthDeviceManager* |
- GetCryptAuthDeviceManager() = 0; |
+ virtual cryptauth::CryptAuthDeviceManager* GetCryptAuthDeviceManager() = 0; |
}; |
} // namespace proximity_auth |