Revert 284192 due to a failing test.

content/child/webcrypto/shared_crypto.h

Index: content/child/webcrypto/shared_crypto.h
diff --git a/content/child/webcrypto/shared_crypto.h b/content/child/webcrypto/shared_crypto.h
new file mode 100644
index 0000000000000000000000000000000000000000..d9e5a959db71e4a8a697a49b6be2c63614975ece
--- /dev/null
+++ b/content/child/webcrypto/shared_crypto.h
@@ -0,0 +1,187 @@
+// 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_SHARED_CRYPTO_H_
+#define CONTENT_CHILD_WEBCRYPTO_SHARED_CRYPTO_H_
+
+#include <vector>
+
+#include "base/basictypes.h"
+#include "base/compiler_specific.h"
+#include "base/memory/scoped_ptr.h"
+#include "content/common/content_export.h"
+#include "third_party/WebKit/public/platform/WebCrypto.h"
+#include "third_party/WebKit/public/platform/WebCryptoAlgorithmParams.h"
+
+namespace content {
+
+namespace webcrypto {
+
+class CryptoData;
+class Status;
+
+// Do one-time initialization. It is safe to call this multiple times.
+// May be called concurrently from multiple threads.
+CONTENT_EXPORT void Init();
+
+// The functions exported by shared_crypto.h provide a common entry point for
+// synchronous crypto operations.
+//
+// Here is how the layer cake looks.
+//
+//              Blink
+//                |
+//  ==============|==========================
+//                |
+//             content
+//                |
+//                |
+//                v
+//          WebCryptoImpl     (Implements the blink::WebCrypto interface for
+//                |            asynchronous completions; posts tasks to
+//                |            the webcrypto worker pool to fulfill the request
+//                             using the synchronous methods of shared_crypto.h)
+//                |
+//                |      [shared_crypto_unittest.cc]
+//                |           /
+//                |          /   (The blink::WebCrypto interface is not
+//                |         /     testable from the chromium side because
+//                |        /      the result object is not mockable.
+//                |       /       Tests are done on shared_crypto instead.
+//                V      v
+//        [shared_crypto.h]   (Exposes synchronous functions in the
+//                |            webcrypto:: namespace. This does
+//                |            common validations, infers default
+//                |            parameters, and casts the algorithm
+//                |            parameters to the right types)
+//                |
+//                V
+//       [platform_crypto.h]  (Exposes functions in the webcrypto::platform
+//                |            namespace)
+//                |
+//                |
+//                V
+//  [platform_crypto_{nss|openssl}.cc]  (Implements using the platform crypto
+//                                       library)
+//
+// The shared_crypto.h functions are responsible for:
+//
+//  * Validating the key usages
+//  * Inferring default parameters when not specified
+//  * Validating key exportability
+//  * Validating algorithm with key.algorithm
+//  * Converting the Blink key to a more specific platform::{PublicKey,
+//    PrivateKey, SymKey} and making sure it was the right type.
+//  * Validating alogorithm specific parameters (for instance, was the iv for
+//    AES-CBC 16 bytes).
+//  * Parse a JWK
+
+CONTENT_EXPORT Status Encrypt(const blink::WebCryptoAlgorithm& algorithm,
+                              const blink::WebCryptoKey& key,
+                              const CryptoData& data,
+                              std::vector<uint8>* buffer);
+
+CONTENT_EXPORT Status Decrypt(const blink::WebCryptoAlgorithm& algorithm,
+                              const blink::WebCryptoKey& key,
+                              const CryptoData& data,
+                              std::vector<uint8>* buffer);
+
+CONTENT_EXPORT Status Digest(const blink::WebCryptoAlgorithm& algorithm,
+                             const CryptoData& data,
+                             std::vector<uint8>* buffer);
+
+CONTENT_EXPORT scoped_ptr<blink::WebCryptoDigestor> CreateDigestor(
+    blink::WebCryptoAlgorithmId algorithm);
+
+CONTENT_EXPORT Status
+    GenerateSecretKey(const blink::WebCryptoAlgorithm& algorithm,
+                      bool extractable,
+                      blink::WebCryptoKeyUsageMask usage_mask,
+                      blink::WebCryptoKey* key);
+
+CONTENT_EXPORT Status
+    GenerateKeyPair(const blink::WebCryptoAlgorithm& algorithm,
+                    bool extractable,
+                    blink::WebCryptoKeyUsageMask usage_mask,
+                    blink::WebCryptoKey* public_key,
+                    blink::WebCryptoKey* private_key);
+
+CONTENT_EXPORT Status ImportKey(blink::WebCryptoKeyFormat format,
+                                const CryptoData& key_data,
+                                const blink::WebCryptoAlgorithm& algorithm,
+                                bool extractable,
+                                blink::WebCryptoKeyUsageMask usage_mask,
+                                blink::WebCryptoKey* key);
+
+CONTENT_EXPORT Status ExportKey(blink::WebCryptoKeyFormat format,
+                                const blink::WebCryptoKey& key,
+                                std::vector<uint8>* buffer);
+
+CONTENT_EXPORT Status Sign(const blink::WebCryptoAlgorithm& algorithm,
+                           const blink::WebCryptoKey& key,
+                           const CryptoData& data,
+                           std::vector<uint8>* buffer);
+
+CONTENT_EXPORT Status
+    VerifySignature(const blink::WebCryptoAlgorithm& algorithm,
+                    const blink::WebCryptoKey& key,
+                    const CryptoData& signature,
+                    const CryptoData& data,
+                    bool* signature_match);
+
+CONTENT_EXPORT Status
+    WrapKey(blink::WebCryptoKeyFormat format,
+            const blink::WebCryptoKey& key_to_wrap,
+            const blink::WebCryptoKey& wrapping_key,
+            const blink::WebCryptoAlgorithm& wrapping_algorithm,
+            std::vector<uint8>* buffer);
+
+CONTENT_EXPORT Status
+    UnwrapKey(blink::WebCryptoKeyFormat format,
+              const CryptoData& wrapped_key_data,
+              const blink::WebCryptoKey& wrapping_key,
+              const blink::WebCryptoAlgorithm& wrapping_algorithm,
+              const blink::WebCryptoAlgorithm& algorithm,
+              bool extractable,
+              blink::WebCryptoKeyUsageMask usage_mask,
+              blink::WebCryptoKey* key);
+
+// Called on the target Blink thread.
+CONTENT_EXPORT bool SerializeKeyForClone(const blink::WebCryptoKey& key,
+                                         blink::WebVector<uint8>* key_data);
+
+// Called on the target Blink thread.
+CONTENT_EXPORT bool DeserializeKeyForClone(
+    const blink::WebCryptoKeyAlgorithm& algorithm,
+    blink::WebCryptoKeyType type,
+    bool extractable,
+    blink::WebCryptoKeyUsageMask usage_mask,
+    const CryptoData& key_data,
+    blink::WebCryptoKey* key);
+
+namespace platform {
+class SymKey;
+class PublicKey;
+class PrivateKey;
+}
+
+Status ToPlatformSymKey(const blink::WebCryptoKey& key, platform::SymKey** out);
+
+Status ToPlatformPublicKey(const blink::WebCryptoKey& key,
+                           platform::PublicKey** out);
+
+Status ToPlatformPrivateKey(const blink::WebCryptoKey& key,
+                            platform::PrivateKey** out);
+
+// Returns Staus::Success() if |usages| is valid for |key_type| and |algorithm|.
+// Otherwise returns a failure
+Status CheckKeyUsages(blink::WebCryptoAlgorithmId algorithm,
+                      blink::WebCryptoKeyType key_type,
+                      blink::WebCryptoKeyUsageMask usages);
+
+}  // namespace webcrypto
+
+}  // namespace content
+
+#endif  // CONTENT_CHILD_WEBCRYPTO_SHARED_CRYPTO_H_