Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(795)

Unified Diff: components/webcrypto/test/aes_kw_unittest.cc

Issue 1077273002: html_viewer: Move webcrypto to a place where html_viewer can use it. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase to ToT Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/webcrypto/test/aes_gcm_unittest.cc ('k') | components/webcrypto/test/ecdh_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/webcrypto/test/aes_kw_unittest.cc
diff --git a/content/child/webcrypto/test/aes_kw_unittest.cc b/components/webcrypto/test/aes_kw_unittest.cc
similarity index 98%
rename from content/child/webcrypto/test/aes_kw_unittest.cc
rename to components/webcrypto/test/aes_kw_unittest.cc
index c7858e16cfd3426ca0f905f85f67942b73edb839..813ce601e738613eb35f1f43d0eeee159d4b583c 100644
--- a/content/child/webcrypto/test/aes_kw_unittest.cc
+++ b/components/webcrypto/test/aes_kw_unittest.cc
@@ -3,16 +3,14 @@
// found in the LICENSE file.
#include "base/stl_util.h"
-#include "content/child/webcrypto/algorithm_dispatch.h"
-#include "content/child/webcrypto/crypto_data.h"
-#include "content/child/webcrypto/status.h"
-#include "content/child/webcrypto/test/test_helpers.h"
-#include "content/child/webcrypto/webcrypto_util.h"
+#include "components/webcrypto/algorithm_dispatch.h"
+#include "components/webcrypto/crypto_data.h"
+#include "components/webcrypto/status.h"
+#include "components/webcrypto/test/test_helpers.h"
+#include "components/webcrypto/webcrypto_util.h"
#include "third_party/WebKit/public/platform/WebCryptoAlgorithmParams.h"
#include "third_party/WebKit/public/platform/WebCryptoKeyAlgorithm.h"
-namespace content {
-
namespace webcrypto {
namespace {
@@ -30,7 +28,7 @@ TEST(WebCryptoAesKwTest, GenerateKeyBadLength) {
SCOPED_TRACE(i);
EXPECT_EQ(Status::ErrorGenerateAesKeyLength(),
GenerateSecretKey(CreateAesKwKeyGenAlgorithm(kKeyLen[i]), true,
- blink::WebCryptoKeyUsageWrapKey, &key));
+ blink::WebCryptoKeyUsageWrapKey, &key));
}
}
@@ -45,8 +43,8 @@ TEST(WebCryptoAesKwTest, ImportKeyEmptyUsage) {
EXPECT_EQ(Status::ErrorCreateKeyEmptyUsages(),
ImportKey(blink::WebCryptoKeyFormatRaw,
CryptoData(std::vector<uint8_t>(16)),
- CreateAlgorithm(blink::WebCryptoAlgorithmIdAesKw),
- true, 0, &key));
+ CreateAlgorithm(blink::WebCryptoAlgorithmIdAesKw), true,
+ 0, &key));
}
TEST(WebCryptoAesKwTest, ImportKeyJwkKeyOpsWrapUnwrap) {
@@ -536,5 +534,3 @@ TEST(WebCryptoAesKwTest, UnwrapRsaSsaPublicKeyBadUsage_JWK) {
} // namespace
} // namespace webcrypto
-
-} // namespace content
« no previous file with comments | « components/webcrypto/test/aes_gcm_unittest.cc ('k') | components/webcrypto/test/ecdh_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698