Do not support uvm for registration at blink

This CL removes uvm extension support and corresponding counters for
registration at blink layer.

This is the second CL for removing uvm for registration.
The first CL:
https://chrome-internal-review.googlesource.com/c/clank/internal/apps/+/1504071

Bug: 986345
Change-Id: Idf74c8a6343609120ac596fd86d2c8d5c7861cb0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1710143Reviewed-by: Ken Buchanan <kenrb@chromium.org>
Reviewed-by: Martin Kreichgauer <martinkr@google.com>
Commit-Queue: Suzy Li <suzyli@google.com>
Cr-Commit-Position: refs/heads/master@{#681123}

third_party/blink/public/mojom/web_feature/web_feature.mojom

@@ -2329,9 +2329,7 @@ enum WebFeature {
   kWebkitMarginAfterCollapseDiscard = 2945,
   kWebkitMarginAfterCollapseSeparate = 2946,
   kWebkitMarginAfterCollapseSeparateMaybeDoesSomething = 2947,
-  kCredentialManagerCreateWithUVM = 2948,
   kCredentialManagerGetWithUVM = 2949,
-  kCredentialManagerCreateSuccessWithUVM = 2950,
   kCredentialManagerGetSuccessWithUVM = 2951,
   kDiscardInputEventToMovingIframe = 2952,
   kSignedExchangeSubresourcePrefetch = 2953,

third_party/blink/public/mojom/webauthn/authenticator.mojom

@@ -59,8 +59,8 @@ struct CommonCredentialInfo {
   array<uint8> client_data_json;
 };
 
-// Content of user verification method extension returned by both
-// Authenticator::MakeCredential and Authenticator::GetAssertion.
+// Content of user verification method extension returned by
+// Authenticator::GetAssertion.
 // See https://w3c.github.io/webauthn/#sctn-uvm-extension
 // Registry of the available values, see
 // https://fidoalliance.org/specs/fido-v2.0-id-20180227/fido-registry-v2.0-id-20180227.html#user-verification-methods

third_party/blink/renderer/modules/credentialmanager/credentials_container.cc

@@ -405,14 +405,6 @@ void OnMakePublicKeyCredentialComplete(
     if (credential->echo_hmac_create_secret) {
       extension_outputs->setHmacCreateSecret(credential->hmac_create_secret);
     }
-#if defined(OS_ANDROID)
-    if (credential->echo_user_verification_methods) {
-      extension_outputs->setUvm(
-          UvmEntryToArray(std::move(*credential->user_verification_methods)));
-      UseCounter::Count(resolver->GetExecutionContext(),
-                        WebFeature::kCredentialManagerCreateSuccessWithUVM);
-    }
-#endif
     resolver->Resolve(MakeGarbageCollected<PublicKeyCredential>(
         credential->info->id, raw_id, authenticator_response,
         extension_outputs));
@@ -708,13 +700,6 @@ ScriptPromise CredentialsContainer::create(
           resolver->GetExecutionContext(),
           WebFeature::kCredentialManagerCreatePublicKeyCredential);
     }
-#if defined(OS_ANDROID)
-    if (options->publicKey()->hasExtensions() &&
-        options->publicKey()->extensions()->hasUvm()) {
-      UseCounter::Count(resolver->GetExecutionContext(),
-                        WebFeature::kCredentialManagerCreateWithUVM);
-    }
-#endif
 
     const String& relying_party_id = options->publicKey()->rp()->id();
     if (!CheckPublicKeySecurityRequirements(resolver, relying_party_id))

tools/metrics/histograms/enums.xml

@@ -24111,9 +24111,7 @@ Called by update_net_error_codes.py.-->
   <int value="2946" label="WebkitMarginAfterCollapseSeparate"/>
   <int value="2947"
       label="WebkitMarginAfterCollapseSeparateMaybeDoesSomething"/>
-  <int value="2948" label="CredentialManagerCreateWithUVM"/>
   <int value="2949" label="CredentialManagerGetWithUVM"/>
-  <int value="2950" label="CredentialManagerCreateSuccessWithUVM"/>
   <int value="2951" label="CredentialManagerGetSuccessWithUVM"/>
   <int value="2952" label="DiscardInputEventToMovingIframe"/>
   <int value="2953" label="SignedExchangeSubresourcePrefetch"/>