Minor cleanup in EasyUnlockClient

chromeos/dbus/fake_easy_unlock_client_unittest.cc

 // 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.
 
 #include "chromeos/dbus/fake_easy_unlock_client.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 185 matching lines @@
   client.PerformECDHKeyAgreement(private_key,
                                  public_key,
                                  base::Bind(&RecordData, &shared_key));
   EXPECT_TRUE(shared_key.empty());
 }
 
 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(
       "{\"securemessage\": {"
           "\"payload\": \"PAYLOAD\","
           "\"key\": \"KEY\","
           "\"associated_data\": \"ASSOCIATED_DATA\","
           "\"public_metadata\": \"PUBLIC_METADATA\","
           "\"verification_key_id\": \"VERIFICATION_KEY_ID\","
           "\"decryption_key_id\": \"DECRYPTION_KEY_ID\","
           "\"encryption_type\": \"ENCRYPTION_TYPE\","
           "\"signature_type\": \"SIGNATURE_TYPE\"}"
       "}");
   ASSERT_EQ(expected_message, message);
 }
 
 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(
       "{\"unwrapped_securemessage\": {"
           "\"message\": \"MESSAGE\","
           "\"key\": \"KEY\","
           "\"associated_data\": \"ASSOCIATED_DATA\","
           "\"encryption_type\": \"ENCRYPTION_TYPE\","
           "\"signature_type\": \"SIGNATURE_TYPE\"}"
       "}");
   ASSERT_EQ(expected_message, message);
 }
 
 }  // namespace