Refactor the interface for generating keys.

content/child/webcrypto/test/test_helpers.h

Index: content/child/webcrypto/test/test_helpers.h
diff --git a/content/child/webcrypto/test/test_helpers.h b/content/child/webcrypto/test/test_helpers.h
index 6357ce2ad88bdb442d140875354f6cbcaafae682..6f1a31d569714fa9cae6cd3e30fc5b473cf62ea5 100644
--- a/content/child/webcrypto/test/test_helpers.h
+++ b/content/child/webcrypto/test/test_helpers.h
@@ -170,6 +170,19 @@ void ImportExportJwkSymmetricKey(
     blink::WebCryptoKeyUsageMask usages,
     const std::string& jwk_alg);
 
+// Wrappers around GenerateKey() which expect the result to be either a secret
+// key or a public/private keypair. If the result does not match the
+// expectation, then it fails with Status::ErrorUnexpected().
+Status GenerateSecretKey(const blink::WebCryptoAlgorithm& algorithm,
+                         bool extractable,
+                         blink::WebCryptoKeyUsageMask usage_mask,
+                         blink::WebCryptoKey* key);
+Status GenerateKeyPair(const blink::WebCryptoAlgorithm& algorithm,
+                       bool extractable,
+                       blink::WebCryptoKeyUsageMask usage_mask,
+                       blink::WebCryptoKey* public_key,
+                       blink::WebCryptoKey* private_key);
+
 }  // namespace webcrypto
 
 }  // namesapce content