Revert of Minor cleanup in EasyUnlockClient

chromeos/dbus/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 "chromeos/dbus/easy_unlock_client.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 56 matching lines @@
         easy_unlock::kEasyUnlockServiceInterface,
         easy_unlock::kGenerateEcP256KeyPairMethod);
     proxy_->CallMethod(&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
                        base::Bind(&EasyUnlockClientImpl::OnKeyPair,
                                   weak_ptr_factory_.GetWeakPtr(),
                                   callback));
   }
 
   // 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,
         easy_unlock::kCreateSecureMessageMethod);
     dbus::MessageWriter writer(&method_call);
     // 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(),
                                   callback));
   }
 
   // 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,
         easy_unlock::kUnwrapSecureMessageMethod);
     dbus::MessageWriter writer(&method_call);
     // 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(),
                                   callback));
   }
 
  protected:
   virtual void Init(dbus::Bus* bus) OVERRIDE {
     proxy_ =
         bus->GetObjectProxy(
@@ skipping 34 matching lines @@
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<EasyUnlockClientImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(EasyUnlockClientImpl);
 };
 
 }  // namespace
 
-EasyUnlockClient::CreateSecureMessageOptions::CreateSecureMessageOptions() {}
-
-EasyUnlockClient::CreateSecureMessageOptions::~CreateSecureMessageOptions() {}
-
-EasyUnlockClient::UnwrapSecureMessageOptions::UnwrapSecureMessageOptions() {}
-
-EasyUnlockClient::UnwrapSecureMessageOptions::~UnwrapSecureMessageOptions() {}
-
 EasyUnlockClient::EasyUnlockClient() {
 }
 
 EasyUnlockClient::~EasyUnlockClient() {
 }
 
 // static
 EasyUnlockClient* EasyUnlockClient::Create() {
   return new EasyUnlockClientImpl();
 }
 
 }  // namespace chromeos