Reland: Minor cleanup in EasyUnlockClient

chromeos/dbus/fake_easy_unlock_client_unittest.cc

Index: chromeos/dbus/fake_easy_unlock_client_unittest.cc
diff --git a/chromeos/dbus/fake_easy_unlock_client_unittest.cc b/chromeos/dbus/fake_easy_unlock_client_unittest.cc
index 7c344d995f7c765238a4e7a7071ab7231dfd7927..2be4024d3a1e038dfc7498ec7599b773b33cb649 100644
--- a/chromeos/dbus/fake_easy_unlock_client_unittest.cc
+++ b/chromeos/dbus/fake_easy_unlock_client_unittest.cc
@@ -203,15 +203,19 @@ TEST(FakeEasyUnlockClientTest, CreateSecureMessage) {
   chromeos::FakeEasyUnlockClient client;
 
   std::string message;
+
+  chromeos::EasyUnlockClient::CreateSecureMessageOptions options;
+  options.key = "KEY";
+  options.associated_data = "ASSOCIATED_DATA";
+  options.public_metadata = "PUBLIC_METADATA";
+  options.verification_key_id = "VERIFICATION_KEY_ID";
+  options.decryption_key_id = "DECRYPTION_KEY_ID";
+  options.encryption_type = "ENCRYPTION_TYPE";
+  options.signature_type = "SIGNATURE_TYPE";
+
   client.CreateSecureMessage(
       "PAYLOAD",
-      "KEY",
-      "ASSOCIATED_DATA",
-      "PUBLIC_METADATA",
-      "VERIFICATION_KEY_ID",
-      "DECRYPTION_KEY_ID",
-      "ENCRYPTION_TYPE",
-      "SIGNATURE_TYPE",
+      options,
       base::Bind(&RecordData, &message));
 
   const std::string expected_message(
@@ -232,12 +236,16 @@ TEST(FakeEasyUnlockClientTest, UnwrapSecureMessage) {
   chromeos::FakeEasyUnlockClient client;
 
   std::string message;
+
+  chromeos::EasyUnlockClient::UnwrapSecureMessageOptions options;
+  options.key = "KEY";
+  options.associated_data = "ASSOCIATED_DATA";
+  options.encryption_type = "ENCRYPTION_TYPE";
+  options.signature_type = "SIGNATURE_TYPE";
+
   client.UnwrapSecureMessage(
       "MESSAGE",
-      "KEY",
-      "ASSOCIATED_DATA",
-      "ENCRYPTION_TYPE",
-      "SIGNATURE_TYPE",
+      options,
       base::Bind(&RecordData, &message));
 
   const std::string expected_message(