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

Unified Diff: content/child/webcrypto/test/aes_cbc_unittest.cc

Issue 670773003: Cleanup: rename usage_mask --> usages. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 | « content/child/webcrypto/structured_clone.cc ('k') | content/child/webcrypto/test/hmac_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/webcrypto/test/aes_cbc_unittest.cc
diff --git a/content/child/webcrypto/test/aes_cbc_unittest.cc b/content/child/webcrypto/test/aes_cbc_unittest.cc
index 7ad0e279fde073d0d731adce27378e629e7b39c3..b7f897c6db5a3aa9794e2e094935b309de971060 100644
--- a/content/child/webcrypto/test/aes_cbc_unittest.cc
+++ b/content/child/webcrypto/test/aes_cbc_unittest.cc
@@ -639,7 +639,7 @@ TEST(WebCryptoAesCbcTest, ImportJwkUnrecognizedKeyOps) {
blink::WebCryptoKey key;
blink::WebCryptoAlgorithm algorithm =
CreateAlgorithm(blink::WebCryptoAlgorithmIdAesCbc);
- blink::WebCryptoKeyUsageMask usage_mask = blink::WebCryptoKeyUsageEncrypt;
+ blink::WebCryptoKeyUsageMask usages = blink::WebCryptoKeyUsageEncrypt;
base::DictionaryValue dict;
dict.SetString("kty", "oct");
@@ -655,7 +655,7 @@ TEST(WebCryptoAesCbcTest, ImportJwkUnrecognizedKeyOps) {
key_ops->AppendString("baz");
key_ops->AppendString("encrypt");
EXPECT_EQ(Status::Success(),
- ImportKeyJwkFromDict(dict, algorithm, false, usage_mask, &key));
+ ImportKeyJwkFromDict(dict, algorithm, false, usages, &key));
}
// Import a JWK with a value in key_ops array that is not a string.
@@ -663,7 +663,7 @@ TEST(WebCryptoAesCbcTest, ImportJwkNonStringKeyOp) {
blink::WebCryptoKey key;
blink::WebCryptoAlgorithm algorithm =
CreateAlgorithm(blink::WebCryptoAlgorithmIdAesCbc);
- blink::WebCryptoKeyUsageMask usage_mask = blink::WebCryptoKeyUsageEncrypt;
+ blink::WebCryptoKeyUsageMask usages = blink::WebCryptoKeyUsageEncrypt;
base::DictionaryValue dict;
dict.SetString("kty", "oct");
@@ -677,7 +677,7 @@ TEST(WebCryptoAesCbcTest, ImportJwkNonStringKeyOp) {
key_ops->AppendString("encrypt");
key_ops->AppendInteger(3);
EXPECT_EQ(Status::ErrorJwkPropertyWrongType("key_ops[1]", "string"),
- ImportKeyJwkFromDict(dict, algorithm, false, usage_mask, &key));
+ ImportKeyJwkFromDict(dict, algorithm, false, usages, &key));
}
// Fail on missing k.
« no previous file with comments | « content/child/webcrypto/structured_clone.cc ('k') | content/child/webcrypto/test/hmac_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698