Refactor the interface for generating keys.

content/child/webcrypto/nss/rsa_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_RSA_KEY_NSS_H_
 #define CONTENT_CHILD_WEBCRYPTO_NSS_RSA_KEY_NSS_H_
 
 #include <pkcs11t.h>
 
 #include "content/child/webcrypto/algorithm_implementation.h"
@@ skipping 25 matching lines @@
                      blink::WebCryptoKeyUsageMask all_public_key_usages,
                      blink::WebCryptoKeyUsageMask all_private_key_usages)
       : generate_flags_(generate_flags),
         all_public_key_usages_(all_public_key_usages),
         all_private_key_usages_(all_private_key_usages) {}
 
   // For instance "RSA-OAEP-256".
   virtual const char* GetJwkAlgorithm(
       const blink::WebCryptoAlgorithmId hash) const = 0;
 
-  virtual Status VerifyKeyUsagesBeforeGenerateKeyPair(
-      blink::WebCryptoKeyUsageMask combined_usage_mask,
-      blink::WebCryptoKeyUsageMask* public_usage_mask,
-      blink::WebCryptoKeyUsageMask* private_usage_mask) const override;
-
-  virtual Status GenerateKeyPair(
-      const blink::WebCryptoAlgorithm& algorithm,
-      bool extractable,
-      blink::WebCryptoKeyUsageMask public_usage_mask,
-      blink::WebCryptoKeyUsageMask private_usage_mask,
-      blink::WebCryptoKey* public_key,
-      blink::WebCryptoKey* private_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 ImportKeyPkcs8(const CryptoData& key_data,
                                 const blink::WebCryptoAlgorithm& algorithm,
                                 bool extractable,
                                 blink::WebCryptoKeyUsageMask usage_mask,
                                 blink::WebCryptoKey* key) const override;
@@ skipping 23 matching lines @@
   CK_FLAGS generate_flags_;
   blink::WebCryptoKeyUsageMask all_public_key_usages_;
   blink::WebCryptoKeyUsageMask all_private_key_usages_;
 };
 
 }  // namespace webcrypto
 
 }  // namespace content
 
 #endif  // CONTENT_CHILD_WEBCRYPTO_NSS_RSA_KEY_NSS_H_