[fido] Replace uvToken by pinUvAuthToken

The FIDO spec has renamed the uvToken parameter to pinUvAuthToken. The
semantics haven't changed for our implementation, so simply renaming
should be enough.

Fixed: 1110106
Change-Id: I46a05f35c404acce842cc5341a8ec117f9d2af84
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2321548
Auto-Submit: Nina Satragno <nsatragno@chromium.org>
Commit-Queue: Martin Kreichgauer <martinkr@google.com>
Reviewed-by: Martin Kreichgauer <martinkr@google.com>
Cr-Commit-Position: refs/heads/master@{#792411}

device/fido/authenticator_supported_options.cc

@@ -84,7 +84,7 @@ cbor::Value AsCBOR(const AuthenticatorSupportedOptions& options) {
   }
 
   if (options.supports_pin_uv_auth_token) {
-    option_map.emplace(kUvTokenMapKey, true);
+    option_map.emplace(kPinUvTokenMapKey, true);
   }
 
   if (options.default_cred_protect != CredProtect::kUVOptional) {

device/fido/device_response_converter.cc

@@ -375,7 +375,7 @@ base::Optional<AuthenticatorGetInfoResponse> ReadCTAPGetInfoResponse(
               : Availability::kSupportedButUnprovisioned;
     }
 
-    option_map_it = option_map.find(CBOR(kUvTokenMapKey));
+    option_map_it = option_map.find(CBOR(kPinUvTokenMapKey));
     if (option_map_it != option_map.end()) {
       if (!option_map_it->second.is_bool()) {
         return base::nullopt;

device/fido/fido_constants.cc

@@ -33,7 +33,7 @@ const char kCredentialManagementMapKey[] = "credMgmt";
 const char kCredentialManagementPreviewMapKey[] = "credentialMgmtPreview";
 const char kBioEnrollmentMapKey[] = "bioEnroll";
 const char kBioEnrollmentPreviewMapKey[] = "userVerificationMgmtPreview";
-const char kUvTokenMapKey[] = "uvToken";
+const char kPinUvTokenMapKey[] = "pinUvAuthToken";
 const char kDefaultCredProtectKey[] = "defaultCredProtect";
 const char kEnterpriseAttestationKey[] = "ep";
 

device/fido/fido_constants.h

@@ -322,7 +322,7 @@ COMPONENT_EXPORT(DEVICE_FIDO)
 extern const char kCredentialManagementPreviewMapKey[];
 COMPONENT_EXPORT(DEVICE_FIDO) extern const char kBioEnrollmentMapKey[];
 COMPONENT_EXPORT(DEVICE_FIDO) extern const char kBioEnrollmentPreviewMapKey[];
-COMPONENT_EXPORT(DEVICE_FIDO) extern const char kUvTokenMapKey[];
+COMPONENT_EXPORT(DEVICE_FIDO) extern const char kPinUvTokenMapKey[];
 extern const char kDefaultCredProtectKey[];
 extern const char kEnterpriseAttestationKey[];