Blink-layer update to match WebAuthN spec

third_party/WebKit/Source/modules/webauth/WebAuthentication.h

Index: third_party/WebKit/Source/modules/webauth/WebAuthentication.h
diff --git a/third_party/WebKit/Source/modules/webauth/WebAuthentication.h b/third_party/WebKit/Source/modules/webauth/WebAuthentication.h
index 0c0c2b3d6c85c69db7d8c5fe1f71f25150ec14c6..2189e05c0844c0e6af858df54762311299e65836 100644
--- a/third_party/WebKit/Source/modules/webauth/WebAuthentication.h
+++ b/third_party/WebKit/Source/modules/webauth/WebAuthentication.h
@@ -5,31 +5,23 @@
 #ifndef WebAuthentication_h
 #define WebAuthentication_h
 
-#include "bindings/core/v8/ArrayBufferOrArrayBufferView.h"
-#include "bindings/core/v8/ScriptPromise.h"
-#include "core/dom/ContextLifecycleObserver.h"
-#include "core/dom/DOMArrayBuffer.h"
-#include "modules/webauth/AuthenticationAssertionOptions.h"
-#include "modules/webauth/ScopedCredentialInfo.h"
 #include "platform/bindings/ScriptWrappable.h"
+#include "platform/heap/Handle.h"
 #include "public/platform/modules/webauth/authenticator.mojom-blink.h"
 
 namespace blink {
 
-class RelyingPartyAccount;
-class AuthenticationAssertionOptions;
-class ScopedCredentialOptions;
-class ScopedCredentialParameters;
+class LocalFrame;
+class MakeCredentialOptions;
+class PublicKeyCredentialRequestOptions;
+class ScriptState;
+class ScriptPromise;
 class ScriptPromiseResolver;
 
-typedef ArrayBufferOrArrayBufferView BufferSource;
-
 class WebAuthentication final
     : public GarbageCollectedFinalized<WebAuthentication>,
-      public ScriptWrappable,
-      public ContextLifecycleObserver {
+      public ScriptWrappable {
   DEFINE_WRAPPERTYPEINFO();
-  USING_GARBAGE_COLLECTED_MIXIN(WebAuthentication);
 
  public:
   static WebAuthentication* Create(LocalFrame& frame) {
@@ -39,22 +31,15 @@ class WebAuthentication final
   virtual ~WebAuthentication();
 
   // WebAuthentication.idl
-  ScriptPromise makeCredential(ScriptState*,
-                               const RelyingPartyAccount&,
-                               const HeapVector<ScopedCredentialParameters>,
-                               const BufferSource&,
-                               ScopedCredentialOptions&);
+  ScriptPromise makeCredential(ScriptState*, const MakeCredentialOptions&);
+
   ScriptPromise getAssertion(ScriptState*,
-                             const BufferSource&,
-                             const AuthenticationAssertionOptions&);
+                             const PublicKeyCredentialRequestOptions&);
 
   webauth::mojom::blink::Authenticator* Authenticator() const {
     return authenticator_.get();
   }
 
-  // ContextLifecycleObserver overrides.
-  void ContextDestroyed(ExecutionContext*) override;
-
   DECLARE_VIRTUAL_TRACE();
 
  private:
@@ -62,12 +47,11 @@ class WebAuthentication final
 
   void OnMakeCredential(ScriptPromiseResolver*,
                         webauth::mojom::blink::AuthenticatorStatus,
-                        webauth::mojom::blink::ScopedCredentialInfoPtr);
+                        webauth::mojom::blink::PublicKeyCredentialInfoPtr);
   ScriptPromise RejectIfNotSupported(ScriptState*);
   void OnAuthenticatorConnectionError();
   bool MarkRequestComplete(ScriptPromiseResolver*);
   void Cleanup();
-
   webauth::mojom::blink::AuthenticatorPtr authenticator_;
   HeapHashSet<Member<ScriptPromiseResolver>> authenticator_requests_;
 };