Refactor the interface for generating keys.

content/child/webcrypto/test/test_helpers.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_CHILD_WEBCRYPTO_TEST_TEST_HELPERS_H_
 #define CONTENT_CHILD_WEBCRYPTO_TEST_TEST_HELPERS_H_
 
 #include <ostream>
 #include <string>
 #include <vector>
@@ skipping 152 matching lines @@
     const std::string& e_expected_hex,
     blink::WebCryptoKeyUsageMask use_mask_expected);
 
 // Helper that tests importing ane exporting of symmetric keys as JWK.
 void ImportExportJwkSymmetricKey(
     int key_len_bits,
     const blink::WebCryptoAlgorithm& import_algorithm,
     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
 
 #endif  // CONTENT_CHILD_WEBCRYPTO_TEST_TEST_HELPERS_H_