Revert of Minor cleanup in EasyUnlockClient

chromeos/dbus/easy_unlock_client.cc

Index: chromeos/dbus/easy_unlock_client.cc
diff --git a/chromeos/dbus/easy_unlock_client.cc b/chromeos/dbus/easy_unlock_client.cc
index 8d171a810173fb293c30e2a1b8a3c477c948633c..ea07f1c0937192eaa666cac0bf28415ed6112558 100644
--- a/chromeos/dbus/easy_unlock_client.cc
+++ b/chromeos/dbus/easy_unlock_client.cc
@@ -74,7 +74,13 @@
 
   // EasyUnlockClient override.
   virtual void CreateSecureMessage(const std::string& payload,
-                                   const CreateSecureMessageOptions& options,
+                                   const std::string& secret_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 DataCallback& callback) OVERRIDE {
     dbus::MethodCall method_call(
         easy_unlock::kEasyUnlockServiceInterface,
@@ -83,13 +89,13 @@
     // NOTE: DBus expects that data sent as string is UTF-8 encoded. This is
     //     not guaranteed here, so the method uses byte arrays.
     AppendStringAsByteArray(payload, &writer);
-    AppendStringAsByteArray(options.key, &writer);
-    AppendStringAsByteArray(options.associated_data, &writer);
-    AppendStringAsByteArray(options.public_metadata, &writer);
-    AppendStringAsByteArray(options.verification_key_id, &writer);
-    AppendStringAsByteArray(options.decryption_key_id, &writer);
-    writer.AppendString(options.encryption_type);
-    writer.AppendString(options.signature_type);
+    AppendStringAsByteArray(secret_key, &writer);
+    AppendStringAsByteArray(associated_data, &writer);
+    AppendStringAsByteArray(public_metadata, &writer);
+    AppendStringAsByteArray(verification_key_id, &writer);
+    AppendStringAsByteArray(decryption_key_id, &writer);
+    writer.AppendString(encryption_type);
+    writer.AppendString(signature_type);
     proxy_->CallMethod(&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
                        base::Bind(&EasyUnlockClientImpl::OnData,
                                   weak_ptr_factory_.GetWeakPtr(),
@@ -98,7 +104,10 @@
 
   // EasyUnlockClient override.
   virtual void UnwrapSecureMessage(const std::string& message,
-                                   const UnwrapSecureMessageOptions& options,
+                                   const std::string& secret_key,
+                                   const std::string& associated_data,
+                                   const std::string& encryption_type,
+                                   const std::string& signature_type,
                                    const DataCallback& callback) OVERRIDE {
     dbus::MethodCall method_call(
         easy_unlock::kEasyUnlockServiceInterface,
@@ -107,10 +116,10 @@
     // NOTE: DBus expects that data sent as string is UTF-8 encoded. This is
     //     not guaranteed here, so the method uses byte arrays.
     AppendStringAsByteArray(message, &writer);
-    AppendStringAsByteArray(options.key, &writer);
-    AppendStringAsByteArray(options.associated_data, &writer);
-    writer.AppendString(options.encryption_type);
-    writer.AppendString(options.signature_type);
+    AppendStringAsByteArray(secret_key, &writer);
+    AppendStringAsByteArray(associated_data, &writer);
+    writer.AppendString(encryption_type);
+    writer.AppendString(signature_type);
     proxy_->CallMethod(&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
                        base::Bind(&EasyUnlockClientImpl::OnData,
                                   weak_ptr_factory_.GetWeakPtr(),
@@ -165,14 +174,6 @@
 
 }  // namespace
 
-EasyUnlockClient::CreateSecureMessageOptions::CreateSecureMessageOptions() {}
-
-EasyUnlockClient::CreateSecureMessageOptions::~CreateSecureMessageOptions() {}
-
-EasyUnlockClient::UnwrapSecureMessageOptions::UnwrapSecureMessageOptions() {}
-
-EasyUnlockClient::UnwrapSecureMessageOptions::~UnwrapSecureMessageOptions() {}
-
 EasyUnlockClient::EasyUnlockClient() {
 }