Reliably cancel in-progress CryptoResult(Impl) upon shutdown.

Source/modules/crypto/CryptoResultImpl.h

Index: Source/modules/crypto/CryptoResultImpl.h
diff --git a/Source/modules/crypto/CryptoResultImpl.h b/Source/modules/crypto/CryptoResultImpl.h
index b6cb6e90126c8290fdfbbd3a2172afc230868247..4b632c218552db944c08257f4dafeab36d8a91ca 100644
--- a/Source/modules/crypto/CryptoResultImpl.h
+++ b/Source/modules/crypto/CryptoResultImpl.h
@@ -40,7 +40,6 @@
 
 namespace blink {
 
-class ScriptPromiseResolver;
 MODULES_EXPORT ExceptionCode webCryptoErrorToExceptionCode(WebCryptoErrorType);
 
 // Wrapper around a Promise to notify completion of the crypto operation.
@@ -55,10 +54,10 @@ MODULES_EXPORT ExceptionCode webCryptoErrorToExceptionCode(WebCryptoErrorType);
 //    m_resolver will be leaked until the ExecutionContext is destroyed.
 class CryptoResultImpl final : public CryptoResult {
 public:
-    ~CryptoResultImpl();
-
     static PassRefPtrWillBeRawPtr<CryptoResultImpl> create(ScriptState*);
 
+    ~CryptoResultImpl();
+
     void completeWithError(WebCryptoErrorType, const WebString&) override;
     void completeWithBuffer(const void* bytes, unsigned bytesSize) override;
     void completeWithJson(const char* utf8Data, unsigned length) override;
@@ -71,6 +70,8 @@ public:
     // ScriptPromise.
     ScriptPromise promise();
 
+    DECLARE_VIRTUAL_TRACE();
+
 private:
     class Resolver;
     explicit CryptoResultImpl(ScriptState*);
@@ -78,12 +79,10 @@ private:
     void clearResolver();
     void cancel();
 
-    // FIXME: ScriptPromiseResolver should not be exported.
-    // Instead, use ScriptPromise.
-    ScriptPromiseResolver* m_resolver;
+    RawPtrWillBeMember<Resolver> m_resolver;
     volatile int m_cancelled;
 };
 
 } // namespace blink
 
-#endif
+#endif // CryptoResultImpl_h