Refactor the interface for generating keys.

content/child/webcrypto/nss/rsa_oaep_nss.cc

Index: content/child/webcrypto/nss/rsa_oaep_nss.cc
diff --git a/content/child/webcrypto/nss/rsa_oaep_nss.cc b/content/child/webcrypto/nss/rsa_oaep_nss.cc
index dac027baee32937fc10e5ce6217f8bbddae02e8c..58d6c8d20760166339ec1bf2e2f071666cefece6 100644
--- a/content/child/webcrypto/nss/rsa_oaep_nss.cc
+++ b/content/child/webcrypto/nss/rsa_oaep_nss.cc
@@ -168,15 +168,16 @@ class RsaOaepImplementation : public RsaHashedAlgorithm {
             blink::WebCryptoKeyUsageDecrypt |
                 blink::WebCryptoKeyUsageUnwrapKey) {}
 
-  virtual Status VerifyKeyUsagesBeforeGenerateKeyPair(
-      blink::WebCryptoKeyUsageMask combined_usage_mask,
-      blink::WebCryptoKeyUsageMask* public_usage_mask,
-      blink::WebCryptoKeyUsageMask* private_usage_mask) const OVERRIDE {
+  virtual Status GenerateKey(const blink::WebCryptoAlgorithm& algorithm,
+                             bool extractable,
+                             blink::WebCryptoKeyUsageMask usage_mask,
+                             blink::WebCryptoKey* public_key,
+                             blink::WebCryptoKey* private_key) const OVERRIDE {
     Status status = NssSupportsRsaOaep();
     if (status.IsError())
       return status;
-    return RsaHashedAlgorithm::VerifyKeyUsagesBeforeGenerateKeyPair(
-        combined_usage_mask, public_usage_mask, private_usage_mask);
+    return RsaHashedAlgorithm::GenerateKey(
+        algorithm, extractable, usage_mask, public_key, private_key);
   }
 
   virtual Status VerifyKeyUsagesBeforeImportKey(