Refactor the interface for generating keys.

content/child/webcrypto/algorithm_implementation.cc

 // 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.
 
 #include "content/child/webcrypto/algorithm_implementation.h"
 
 #include "content/child/webcrypto/status.h"
 
 namespace content {
 
@@ skipping 34 matching lines @@
   return Status::ErrorUnsupported();
 }
 
 Status AlgorithmImplementation::Digest(
     const blink::WebCryptoAlgorithm& algorithm,
     const CryptoData& data,
     std::vector<uint8_t>* buffer) const {
   return Status::ErrorUnsupported();
 }
 
-Status AlgorithmImplementation::VerifyKeyUsagesBeforeGenerateKey(
-    blink::WebCryptoKeyUsageMask usage_mask) const {
+Status AlgorithmImplementation::GenerateKey(
+    const blink::WebCryptoAlgorithm& algorithm,
+    bool extractable,
+    blink::WebCryptoKeyUsageMask usage_mask,
+    GenerateKeyResult* result) const {
   return Status::ErrorUnsupported();
 }
 
-Status AlgorithmImplementation::VerifyKeyUsagesBeforeGenerateKeyPair(
-    blink::WebCryptoKeyUsageMask usage_mask,
-    blink::WebCryptoKeyUsageMask* public_usage_mask,
-    blink::WebCryptoKeyUsageMask* private_usage_mask) const {
-  *public_usage_mask = *private_usage_mask = 0;
-  return Status::ErrorUnsupported();
-}
-
-Status AlgorithmImplementation::GenerateSecretKey(
-    const blink::WebCryptoAlgorithm& algorithm,
-    bool extractable,
-    blink::WebCryptoKeyUsageMask usage_mask,
-    blink::WebCryptoKey* key) const {
-  return Status::ErrorUnsupported();
-}
-
-Status AlgorithmImplementation::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 {
-  return Status::ErrorUnsupported();
-}
-
 Status AlgorithmImplementation::VerifyKeyUsagesBeforeImportKey(
     blink::WebCryptoKeyFormat format,
     blink::WebCryptoKeyUsageMask usage_mask) const {
   return Status::ErrorUnsupportedImportKeyFormat();
 }
 
 Status AlgorithmImplementation::ImportKeyRaw(
     const CryptoData& key_data,
     const blink::WebCryptoAlgorithm& algorithm,
     bool extractable,
@@ skipping 49 matching lines @@
 
 Status AlgorithmImplementation::ExportKeyJwk(
     const blink::WebCryptoKey& key,
     std::vector<uint8_t>* buffer) const {
   return Status::ErrorUnsupportedExportKeyFormat();
 }
 
 }  // namespace webcrypto
 
 }  // namespace content