Refactor the interface for generating keys.

content/child/webcrypto/nss/aes_key_nss.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_NSS_AES_NSS_H_
 #define CONTENT_CHILD_WEBCRYPTO_NSS_AES_NSS_H_
 
 #include <pkcs11t.h>
 
 #include "content/child/webcrypto/algorithm_implementation.h"
@@ skipping 18 matching lines @@
                blink::WebCryptoKeyUsageMask all_key_usages,
                const std::string& jwk_suffix);
 
   // This is the same as the other AesAlgorithm constructor, however
   // |import_flags| and |all_key_usages| are pre-filled to values for
   // encryption/decryption algorithms (supports usages for: encrypt, decrypt,
   // wrap, unwrap).
   AesAlgorithm(CK_MECHANISM_TYPE import_mechanism,
                const std::string& jwk_suffix);
 
-  virtual Status VerifyKeyUsagesBeforeGenerateKey(
-      blink::WebCryptoKeyUsageMask usage_mask) const override;
-
-  virtual Status GenerateSecretKey(const blink::WebCryptoAlgorithm& algorithm,
-                                   bool extractable,
-                                   blink::WebCryptoKeyUsageMask usage_mask,
-                                   blink::WebCryptoKey* key) const override;
+  virtual Status GenerateKey(const blink::WebCryptoAlgorithm& algorithm,
+                             bool extractable,
+                             blink::WebCryptoKeyUsageMask usage_mask,
+                             GenerateKeyResult* result) const override;
 
   virtual Status VerifyKeyUsagesBeforeImportKey(
       blink::WebCryptoKeyFormat format,
       blink::WebCryptoKeyUsageMask usage_mask) const override;
 
   virtual Status ImportKeyRaw(const CryptoData& key_data,
                               const blink::WebCryptoAlgorithm& algorithm,
                               bool extractable,
                               blink::WebCryptoKeyUsageMask usage_mask,
                               blink::WebCryptoKey* key) const override;
@@ skipping 15 matching lines @@
   const CK_FLAGS import_flags_;
   const blink::WebCryptoKeyUsageMask all_key_usages_;
   const std::string jwk_suffix_;
 };
 
 }  // namespace webcrypto
 
 }  // namespace content
 
 #endif  // CONTENT_CHILD_WEBCRYPTO_NSS_AES_NSS_H_