Revert 284192 due to a failing test.

content/child/webcrypto/nss/aes_key_nss.h

Index: content/child/webcrypto/nss/aes_key_nss.h
diff --git a/content/child/webcrypto/nss/aes_key_nss.h b/content/child/webcrypto/nss/aes_key_nss.h
deleted file mode 100644
index 614d90902f63f70f5c2a85f838d8564c93ad5c74..0000000000000000000000000000000000000000
--- a/content/child/webcrypto/nss/aes_key_nss.h
+++ /dev/null
@@ -1,80 +0,0 @@
-// 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_NSS_AES_NSS_H_
-#define CONTENT_CHILD_WEBCRYPTO_NSS_AES_NSS_H_
-
-#include <pkcs11t.h>
-
-#include "content/child/webcrypto/algorithm_implementation.h"
-
-namespace content {
-
-namespace webcrypto {
-
-// Base class for AES algorithms that provides the implementation for key
-// creation and export.
-class AesAlgorithm : public AlgorithmImplementation {
- public:
-  // Constructs an AES algorithm whose keys will be imported using the NSS
-  // mechanism |import_mechanism| and NSS flags |import_flags|.
-  // |all_key_usages| is the set of all WebCrypto key usages that are
-  // allowed for imported or generated keys. |jwk_suffix| is the suffix
-  // used when constructing JWK names for the algorithm. For instance A128CBC
-  // is the JWK name for 128-bit AES-CBC. The |jwk_suffix| in this case would
-  // be "CBC".
-  AesAlgorithm(CK_MECHANISM_TYPE import_mechanism,
-               CK_FLAGS import_flags,
-               blink::WebCryptoKeyUsageMask all_key_usages,
-               const std::string& jwk_suffix);
-
-  // This is the same as the other AesAlgorithm constructor, however
-  // |import_flags| and |all_key_usages| are pre-filled to values for
-  // encryption/decryption algorithms (supports usages for: encrypt, decrypt,
-  // wrap, unwrap).
-  AesAlgorithm(CK_MECHANISM_TYPE import_mechanism,
-               const std::string& jwk_suffix);
-
-  virtual Status VerifyKeyUsagesBeforeGenerateKey(
-      blink::WebCryptoKeyUsageMask usage_mask) const OVERRIDE;
-
-  virtual Status GenerateSecretKey(const blink::WebCryptoAlgorithm& algorithm,
-                                   bool extractable,
-                                   blink::WebCryptoKeyUsageMask usage_mask,
-                                   blink::WebCryptoKey* key) const OVERRIDE;
-
-  virtual Status VerifyKeyUsagesBeforeImportKey(
-      blink::WebCryptoKeyFormat format,
-      blink::WebCryptoKeyUsageMask usage_mask) const OVERRIDE;
-
-  virtual Status ImportKeyRaw(const CryptoData& key_data,
-                              const blink::WebCryptoAlgorithm& algorithm,
-                              bool extractable,
-                              blink::WebCryptoKeyUsageMask usage_mask,
-                              blink::WebCryptoKey* key) const OVERRIDE;
-
-  virtual Status ImportKeyJwk(const CryptoData& key_data,
-                              const blink::WebCryptoAlgorithm& algorithm,
-                              bool extractable,
-                              blink::WebCryptoKeyUsageMask usage_mask,
-                              blink::WebCryptoKey* key) const OVERRIDE;
-
-  virtual Status ExportKeyRaw(const blink::WebCryptoKey& key,
-                              std::vector<uint8>* buffer) const OVERRIDE;
-
-  virtual Status ExportKeyJwk(const blink::WebCryptoKey& key,
-                              std::vector<uint8>* buffer) const OVERRIDE;
-
- private:
-  const CK_MECHANISM_TYPE import_mechanism_;
-  const CK_FLAGS import_flags_;
-  const blink::WebCryptoKeyUsageMask all_key_usages_;
-  const std::string jwk_suffix_;
-};
-
-}  // namespace webcrypto
-
-}  // namespace content
-
-#endif  // CONTENT_CHILD_WEBCRYPTO_NSS_AES_NSS_H_