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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api_chromeos_unittest.cc

Issue 569813002: Minor cleanup in EasyUnlockClient (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 6 years, 3 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 | « chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc ('k') | chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_crypto_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api_chromeos_unittest.cc
diff --git a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api_chromeos_unittest.cc b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api_chromeos_unittest.cc
index 25d9b0db3c1c2dafafe327f28fbeb7fff9457a5a..61fadc8619a644fac06e1dc57f57e1cc7512ff68 100644
--- a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api_chromeos_unittest.cc
+++ b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api_chromeos_unittest.cc
@@ -166,16 +166,19 @@ TEST_F(EasyUnlockPrivateApiTest, CreateSecureMessage) {
new EasyUnlockPrivateCreateSecureMessageFunction());
function->set_has_callback(true);
+ chromeos::EasyUnlockClient::CreateSecureMessageOptions create_options;
+ create_options.key = "KEY";
+ create_options.associated_data = "ASSOCIATED_DATA";
+ create_options.public_metadata = "PUBLIC_METADATA";
+ create_options.verification_key_id = "VERIFICATION_KEY_ID";
+ create_options.decryption_key_id = "DECRYPTION_KEY_ID";
+ create_options.encryption_type = easy_unlock::kEncryptionTypeAES256CBC;
+ create_options.signature_type = easy_unlock::kSignatureTypeHMACSHA256;
+
std::string expected_result;
client_->CreateSecureMessage(
"PAYLOAD",
- "KEY",
- "ASSOCIATED_DATA",
- "PUBLIC_METADATA",
- "VERIFICATION_KEY_ID",
- "DECRYPTION_KEY_ID",
- easy_unlock::kEncryptionTypeAES256CBC,
- easy_unlock::kSignatureTypeHMACSHA256,
+ create_options,
base::Bind(&CopyData, &expected_result));
ASSERT_GT(expected_result.length(), 0u);
@@ -211,16 +214,15 @@ TEST_F(EasyUnlockPrivateApiTest, CreateSecureMessage_EmptyOptions) {
new EasyUnlockPrivateCreateSecureMessageFunction());
function->set_has_callback(true);
+ chromeos::EasyUnlockClient::CreateSecureMessageOptions create_options;
+ create_options.key = "KEY";
+ create_options.encryption_type = easy_unlock::kEncryptionTypeNone;
+ create_options.signature_type = easy_unlock::kSignatureTypeHMACSHA256;
+
std::string expected_result;
client_->CreateSecureMessage(
"PAYLOAD",
- "KEY",
- "", // associated data
- "", // public metadata
- "", // verification key id
- "", // decryption key id
- easy_unlock::kEncryptionTypeNone,
- easy_unlock::kSignatureTypeHMACSHA256,
+ create_options,
base::Bind(&CopyData, &expected_result));
ASSERT_GT(expected_result.length(), 0u);
@@ -244,16 +246,17 @@ TEST_F(EasyUnlockPrivateApiTest, CreateSecureMessage_AsymmetricSign) {
new EasyUnlockPrivateCreateSecureMessageFunction());
function->set_has_callback(true);
+ chromeos::EasyUnlockClient::CreateSecureMessageOptions create_options;
+ create_options.key = "KEY";
+ create_options.associated_data = "ASSOCIATED_DATA";
+ create_options.verification_key_id = "VERIFICATION_KEY_ID";
+ create_options.encryption_type = easy_unlock::kEncryptionTypeNone;
+ create_options.signature_type = easy_unlock::kSignatureTypeECDSAP256SHA256;
+
std::string expected_result;
client_->CreateSecureMessage(
"PAYLOAD",
- "KEY",
- "ASSOCIATED_DATA",
- "", // public metadata
- "VERIFICATION_KEY_ID",
- "", // decryption key id
- easy_unlock::kEncryptionTypeNone,
- easy_unlock::kSignatureTypeECDSAP256SHA256,
+ create_options,
base::Bind(&CopyData, &expected_result));
ASSERT_GT(expected_result.length(), 0u);
@@ -284,18 +287,21 @@ TEST_F(EasyUnlockPrivateApiTest, UnwrapSecureMessage) {
new EasyUnlockPrivateUnwrapSecureMessageFunction());
function->set_has_callback(true);
+ chromeos::EasyUnlockClient::UnwrapSecureMessageOptions unwrap_options;
+ unwrap_options.key = "KEY";
+ unwrap_options.associated_data = "ASSOCIATED_DATA";
+ unwrap_options.encryption_type = easy_unlock::kEncryptionTypeAES256CBC;
+ unwrap_options.signature_type = easy_unlock::kSignatureTypeHMACSHA256;
+
std::string expected_result;
client_->UnwrapSecureMessage(
- "PAYLOAD",
- "KEY",
- "ASSOCIATED_DATA",
- easy_unlock::kEncryptionTypeAES256CBC,
- easy_unlock::kSignatureTypeHMACSHA256,
+ "MESSAGE",
+ unwrap_options,
base::Bind(&CopyData, &expected_result));
ASSERT_GT(expected_result.length(), 0u);
scoped_ptr<base::ListValue> args(new base::ListValue);
- args->Append(StringToBinaryValue("PAYLOAD"));
+ args->Append(StringToBinaryValue("MESSAGE"));
args->Append(StringToBinaryValue("KEY"));
base::DictionaryValue* options = new base::DictionaryValue();
args->Append(options);
@@ -321,13 +327,15 @@ TEST_F(EasyUnlockPrivateApiTest, UnwrapSecureMessage_EmptyOptions) {
new EasyUnlockPrivateUnwrapSecureMessageFunction());
function->set_has_callback(true);
+ chromeos::EasyUnlockClient::UnwrapSecureMessageOptions unwrap_options;
+ unwrap_options.key = "KEY";
+ unwrap_options.encryption_type = easy_unlock::kEncryptionTypeNone;
+ unwrap_options.signature_type = easy_unlock::kSignatureTypeHMACSHA256;
+
std::string expected_result;
client_->UnwrapSecureMessage(
"MESSAGE",
- "KEY",
- "", // associated data
- easy_unlock::kEncryptionTypeNone,
- easy_unlock::kSignatureTypeHMACSHA256,
+ unwrap_options,
base::Bind(&CopyData, &expected_result));
ASSERT_GT(expected_result.length(), 0u);
@@ -351,13 +359,16 @@ TEST_F(EasyUnlockPrivateApiTest, UnwrapSecureMessage_AsymmetricSign) {
new EasyUnlockPrivateUnwrapSecureMessageFunction());
function->set_has_callback(true);
+ chromeos::EasyUnlockClient::UnwrapSecureMessageOptions unwrap_options;
+ unwrap_options.key = "KEY";
+ unwrap_options.associated_data = "ASSOCIATED_DATA";
+ unwrap_options.encryption_type = easy_unlock::kEncryptionTypeNone;
+ unwrap_options.signature_type = easy_unlock::kSignatureTypeECDSAP256SHA256;
+
std::string expected_result;
client_->UnwrapSecureMessage(
"MESSAGE",
- "KEY",
- "ASSOCIATED_DATA",
- easy_unlock::kEncryptionTypeNone,
- easy_unlock::kSignatureTypeECDSAP256SHA256,
+ unwrap_options,
base::Bind(&CopyData, &expected_result));
ASSERT_GT(expected_result.length(), 0u);
« no previous file with comments | « chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc ('k') | chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_crypto_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698