Reland: Minor cleanup in EasyUnlockClient

chromeos/dbus/fake_easy_unlock_client.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 "base/json/json_string_value_serializer.h"
 #include "base/strings/stringprintf.h"
 #include "chromeos/dbus/fake_easy_unlock_client.h"
 
 namespace {
 
@@ skipping 77 matching lines @@
   // same shared key. To achieve this, identify the created key by sum and
   // product of the used key pairs.
   callback.Run(base::StringPrintf(
       "{\"secret_key\": [%d, %d]}",
       private_key_index + public_key_index,
       private_key_index * public_key_index));
 }
 
 void FakeEasyUnlockClient::CreateSecureMessage(
     const std::string& payload,
-    const std::string& key,
-    const std::string& associated_data,
-    const std::string& public_metadata,
-    const std::string& verification_key_id,
-    const std::string& decryption_key_id,
-    const std::string& encryption_type,
-    const std::string& signature_type,
+    const CreateSecureMessageOptions& options,
     const DataCallback& callback) {
   callback.Run(base::StringPrintf(
       "{\"securemessage\": {"
           "\"payload\": \"%s\","
           "\"key\": \"%s\","
           "\"associated_data\": \"%s\","
           "\"public_metadata\": \"%s\","
           "\"verification_key_id\": \"%s\","
           "\"decryption_key_id\": \"%s\","
           "\"encryption_type\": \"%s\","
           "\"signature_type\": \"%s\""
       "}}",
       payload.c_str(),
-      key.c_str(),
-      associated_data.c_str(),
-      public_metadata.c_str(),
-      verification_key_id.c_str(),
-      decryption_key_id.c_str(),
-      encryption_type.c_str(),
-      signature_type.c_str()));
+      options.key.c_str(),
+      options.associated_data.c_str(),
+      options.public_metadata.c_str(),
+      options.verification_key_id.c_str(),
+      options.decryption_key_id.c_str(),
+      options.encryption_type.c_str(),
+      options.signature_type.c_str()));
 }
 
 void FakeEasyUnlockClient::UnwrapSecureMessage(
     const std::string& message,
-    const std::string& key,
-    const std::string& associated_data,
-    const std::string& encryption_type,
-    const std::string& signature_type,
+    const UnwrapSecureMessageOptions& options,
     const DataCallback& callback) {
   // TODO(tbarzic): Verify that |message| is in the format returned by
   // |CreateSecureMessage| and extract payload, metadata and
   // verification_key_id from there.
   callback.Run(base::StringPrintf(
       "{\"unwrapped_securemessage\": {"
           "\"message\": \"%s\","
           "\"key\": \"%s\","
           "\"associated_data\": \"%s\","
           "\"encryption_type\": \"%s\","
           "\"signature_type\": \"%s\""
       "}}",
       message.c_str(),
-      key.c_str(),
-      associated_data.c_str(),
-      encryption_type.c_str(),
-      signature_type.c_str()));
+      options.key.c_str(),
+      options.associated_data.c_str(),
+      options.encryption_type.c_str(),
+      options.signature_type.c_str()));
 }
 
 }  // namespace chromeos