Index: chrome/browser/signin/chrome_proximity_auth_client.cc |
diff --git a/chrome/browser/signin/chrome_proximity_auth_client.cc b/chrome/browser/signin/chrome_proximity_auth_client.cc |
index 94e33cfbe5b9a0bbeedc7f31fb6cbedb8a4fb12d..da812d164b4a4f13e90f1fe389f17435d71275fc 100644 |
--- a/chrome/browser/signin/chrome_proximity_auth_client.cc |
+++ b/chrome/browser/signin/chrome_proximity_auth_client.cc |
@@ -97,7 +97,14 @@ PrefService* ChromeProximityAuthClient::GetPrefService() { |
std::unique_ptr<cryptauth::SecureMessageDelegate> |
ChromeProximityAuthClient::CreateSecureMessageDelegate() { |
- return GetCryptAuthService()->CreateSecureMessageDelegate(); |
+// Note: Although CryptAuthService::CreateSecureMessageDelegate() exists, we |
+// don't use it here (as opposed to other methods in this class) because the |
+// CryptAuthService is not available on the ChromeOS login screen. |
+#if defined(OS_CHROMEOS) |
+ return base::MakeUnique<chromeos::SecureMessageDelegateChromeOS>(); |
+#else |
+ return nullptr; |
+#endif |
} |
std::unique_ptr<cryptauth::CryptAuthClientFactory> |