[refactor] More post-NSS WebCrypto cleanups (utility functions).

components/webcrypto/algorithms/util_openssl.h

Index: components/webcrypto/algorithms/util_openssl.h
diff --git a/components/webcrypto/algorithms/util_openssl.h b/components/webcrypto/algorithms/util_openssl.h
index d9ae95b0d9bc811813ef24da90778b9642386e1d..f3e4ddaeab43cfe8e7062614863a906217e34819 100644
--- a/components/webcrypto/algorithms/util_openssl.h
+++ b/components/webcrypto/algorithms/util_openssl.h
@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include <openssl/ossl_typ.h>
+#include <openssl/base.h>
 
 #include "crypto/scoped_openssl_types.h"
 #include "third_party/WebKit/public/platform/WebCryptoAlgorithm.h"
@@ -39,25 +39,6 @@ Status AeadEncryptDecrypt(EncryptOrDecrypt mode,
                           const EVP_AEAD* aead_alg,
                           std::vector<uint8_t>* buffer);
 
-// Generates a random secret key of the given bit length. If the bit length is
-// not a multiple of 8, then the resulting key will have ceil(keylen_bits / 8)
-// bytes, and the "unused" bits will be set to zero. This function does not do
-// any validation checks on the provided parameters.
-Status GenerateWebCryptoSecretKey(const blink::WebCryptoKeyAlgorithm& algorithm,
-                                  bool extractable,
-                                  blink::WebCryptoKeyUsageMask usages,
-                                  unsigned int keylen_bits,
-                                  GenerateKeyResult* result);
-
-// Creates a WebCrypto secret key given a the raw data. The provided |key_data|
-// will be copied into the new key. This function does not do any validation
-// checks for the provided parameters.
-Status CreateWebCryptoSecretKey(const CryptoData& key_data,
-                                const blink::WebCryptoKeyAlgorithm& algorithm,
-                                bool extractable,
-                                blink::WebCryptoKeyUsageMask usages,
-                                blink::WebCryptoKey* key);
-
 // Creates a WebCrypto public key given an EVP_PKEY. This step includes
 // exporting the key to SPKI format, for use by serialization later.
 Status CreateWebCryptoPublicKey(crypto::ScopedEVP_PKEY public_key,