Revert of [webcrypto] JWK: Updated import(ext, key_ops) and added export of symmetric keys

content/child/webcrypto/webcrypto_util.h

Index: content/child/webcrypto/webcrypto_util.h
diff --git a/content/child/webcrypto/webcrypto_util.h b/content/child/webcrypto/webcrypto_util.h
index 9d23c73dead79cdd0e126607e8f195ba1e006327..3c82da96ec71d6211b739b021b679c7090a5ddf9 100644
--- a/content/child/webcrypto/webcrypto_util.h
+++ b/content/child/webcrypto/webcrypto_util.h
@@ -8,8 +8,6 @@
 #include <string>
 #include <vector>
 #include "base/basictypes.h"
-#include "base/strings/string_piece.h"
-#include "base/values.h"
 #include "content/common/content_export.h"
 #include "third_party/WebKit/public/platform/WebArrayBuffer.h"
 #include "third_party/WebKit/public/platform/WebCrypto.h"  // TODO(eroman): delete
@@ -75,9 +73,9 @@
   // base64 decoded.
   static Status ErrorJwkBase64Decode(const std::string& property);
 
-  // The "ext" parameter was specified but was
+  // The "extractable" parameter was specified but was
   // incompatible with the value requested by the Web Crypto call.
-  static Status ErrorJwkExtInconsistent();
+  static Status ErrorJwkExtractableInconsistent();
 
   // The "alg" parameter could not be converted to an equivalent
   // WebCryptoAlgorithm. Either it was malformed or unrecognized.
@@ -93,23 +91,11 @@
 
   // The "use" parameter was specified, however it couldn't be converted to an
   // equivalent Web Crypto usage.
-  static Status ErrorJwkUnrecognizedUse();
-
-  // The "key_ops" parameter was specified, however one of the values in the
-  // array couldn't be converted to an equivalent Web Crypto usage.
-  static Status ErrorJwkUnrecognizedKeyop();
+  static Status ErrorJwkUnrecognizedUsage();
 
   // The "use" parameter was specified, however it is incompatible with that
   // specified by the Web Crypto import operation.
-  static Status ErrorJwkUseInconsistent();
-
-  // The "key_ops" parameter was specified, however it is incompatible with that
-  // specified by the Web Crypto import operation.
-  static Status ErrorJwkKeyopsInconsistent();
-
-  // Both the "key_ops" and the "use" parameters were specified, however they
-  // are incompatible with each other.
-  static Status ErrorJwkUseAndKeyopsInconsistent();
+  static Status ErrorJwkUsageInconsistent();
 
   // TODO(eroman): Private key import through JWK is not yet supported.
   static Status ErrorJwkRsaPrivateKeyUnsupported();
@@ -232,21 +218,7 @@
 // This function decodes unpadded 'base64url' encoded data, as described in
 // RFC4648 (http://www.ietf.org/rfc/rfc4648.txt) Section 5.
 // In Web Crypto, this type of encoding is only used inside JWK.
-CONTENT_EXPORT bool Base64DecodeUrlSafe(const std::string& input,
-                                        std::string* output);
-
-// Returns an unpadded 'base64url' encoding of the input data, the opposite of
-// Base64DecodeUrlSafe() above.
-std::string Base64EncodeUrlSafe(const base::StringPiece& input);
-
-// Composes a Web Crypto usage mask from an array of JWK key_ops values.
-CONTENT_EXPORT Status GetWebCryptoUsagesFromJwkKeyOps(
-    const base::ListValue* jwk_key_ops_value,
-    blink::WebCryptoKeyUsageMask* jwk_key_ops_mask);
-
-// Composes a JWK key_ops array from a Web Crypto usage mask.
-base::ListValue* CreateJwkKeyOpsFromWebCryptoUsages(
-    blink::WebCryptoKeyUsageMask usage_mask);
+bool Base64DecodeUrlSafe(const std::string& input, std::string* output);
 
 CONTENT_EXPORT bool IsHashAlgorithm(blink::WebCryptoAlgorithmId alg_id);