Refactor WebCrypto code

content/child/webcrypto/status.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/status.h"
 
 namespace content {
 
 namespace webcrypto {
 
@@ skipping 40 matching lines @@
       "The JWK property \"" + property + "\" could not be base64 decoded");
 }
 
 Status Status::ErrorJwkExtInconsistent() {
   return Status(
       blink::WebCryptoErrorTypeData,
       "The \"ext\" property of the JWK dictionary is inconsistent what that "
       "specified by the Web Crypto call");
 }
 
-Status Status::ErrorJwkUnrecognizedAlgorithm() {
-  return Status(blink::WebCryptoErrorTypeData,
-                "The JWK \"alg\" property was not recognized");
-}
-
 Status Status::ErrorJwkAlgorithmInconsistent() {
   return Status(blink::WebCryptoErrorTypeData,
                 "The JWK \"alg\" property was inconsistent with that specified "
                 "by the Web Crypto call");
 }
 
 Status Status::ErrorJwkUnrecognizedUse() {
   return Status(blink::WebCryptoErrorTypeData,
                 "The JWK \"use\" property could not be parsed");
 }
@@ skipping 16 matching lines @@
                 "specified by the Web Crypto call. The JWK usage must be a "
                 "superset of those requested");
 }
 
 Status Status::ErrorJwkUseAndKeyopsInconsistent() {
   return Status(blink::WebCryptoErrorTypeData,
                 "The JWK \"use\" and \"key_ops\" properties were both found "
                 "but are inconsistent with each other.");
 }
 
-Status Status::ErrorJwkUnrecognizedKty() {
+Status Status::ErrorJwkUnexpectedKty(const std::string& expected) {
   return Status(blink::WebCryptoErrorTypeData,
-                "The JWK \"kty\" property was unrecognized");
+                "The JWK \"kty\" property was not \"" + expected + "\"");
 }
 
 Status Status::ErrorJwkIncorrectKeyLength() {
   return Status(blink::WebCryptoErrorTypeData,
                 "The JWK \"k\" property did not include the right length "
                 "of key data for the given algorithm.");
 }
 
 Status Status::ErrorJwkIncompleteOptionalRsaPrivateKey() {
   return Status(blink::WebCryptoErrorTypeData,
                 "The optional JWK properties p, q, dp, dq, qi must either all "
                 "be provided, or none provided");
 }
 
 Status Status::ErrorImportEmptyKeyData() {
   return Status(blink::WebCryptoErrorTypeData, "No key data was provided");
 }
 
+Status Status::ErrorUnsupportedImportKeyFormat() {
+  return Status(blink::WebCryptoErrorTypeNotSupported,
+                "Unsupported import key format for algorithm");
+}
+
+Status Status::ErrorUnsupportedExportKeyFormat() {
+  return Status(blink::WebCryptoErrorTypeNotSupported,
+                "Unsupported export key format for algorithm");
+}
+
 Status Status::ErrorImportAesKeyLength() {
   return Status(blink::WebCryptoErrorTypeData,
                 "AES key data must be 128, 192 or 256 bits");
 }
 
 Status Status::ErrorAes192BitUnsupported() {
   return Status(blink::WebCryptoErrorTypeNotSupported,
                 "192-bit AES keys are not supported");
 }
 
@@ skipping 84 matching lines @@
       error_type_(error_type),
       error_details_(error_details_utf8) {
 }
 
 Status::Status(Type type) : type_(type) {
 }
 
 }  // namespace webcrypto
 
 }  // namespace content