Add ability to pass decryption key id to CreateSecureMessage method

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 191 matching lines @@
 TEST(FakeEasyUnlockClientTest, CreateSecureMessage) {
   chromeos::FakeEasyUnlockClient client;
 
   std::string message;
   client.CreateSecureMessage(
       "PAYLOAD",
       "KEY",
       "ASSOCIATED_DATA",
       "PUBLIC_METADATA",
       "VERIFICATION_KEY_ID",
+      "DECRYPTION_KEY_ID",
       "ENCRYPTION_TYPE",
       "SIGNATURE_TYPE",
       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;
@@ skipping 11 matching lines @@
           "\"key\": \"KEY\","
           "\"associated_data\": \"ASSOCIATED_DATA\","
           "\"encryption_type\": \"ENCRYPTION_TYPE\","
           "\"signature_type\": \"SIGNATURE_TYPE\"}"
       "}");
   ASSERT_EQ(expected_message, message);
 }
 
 }  // namespace