Revert of Minor cleanup in EasyUnlockClient

chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.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 "chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 245 matching lines @@
 
 EasyUnlockPrivatePerformECDHKeyAgreementFunction::
 ~EasyUnlockPrivatePerformECDHKeyAgreementFunction() {}
 
 bool EasyUnlockPrivatePerformECDHKeyAgreementFunction::RunAsync() {
   scoped_ptr<easy_unlock_private::PerformECDHKeyAgreement::Params> params =
       easy_unlock_private::PerformECDHKeyAgreement::Params::Create(*args_);
   EXTENSION_FUNCTION_VALIDATE(params);
 
   GetCryptoDelegate(browser_context())->PerformECDHKeyAgreement(
-      *params,
+      params->private_key,
+      params->public_key,
       base::Bind(&EasyUnlockPrivatePerformECDHKeyAgreementFunction::OnData,
                  this));
   return true;
 }
 
 void EasyUnlockPrivatePerformECDHKeyAgreementFunction::OnData(
     const std::string& secret_key) {
   // TODO(tbarzic): Improve error handling.
   if (!secret_key.empty()) {
     results_ = easy_unlock_private::PerformECDHKeyAgreement::Results::Create(
@@ skipping 31 matching lines @@
 
 EasyUnlockPrivateCreateSecureMessageFunction::
 ~EasyUnlockPrivateCreateSecureMessageFunction() {}
 
 bool EasyUnlockPrivateCreateSecureMessageFunction::RunAsync() {
   scoped_ptr<easy_unlock_private::CreateSecureMessage::Params> params =
       easy_unlock_private::CreateSecureMessage::Params::Create(*args_);
   EXTENSION_FUNCTION_VALIDATE(params);
 
   GetCryptoDelegate(browser_context())->CreateSecureMessage(
-      *params,
+      params->payload,
+      params->key,
+      params->options.associated_data ?
+          *params->options.associated_data : std::string(),
+      params->options.public_metadata ?
+          *params->options.public_metadata : std::string(),
+      params->options.verification_key_id ?
+          *params->options.verification_key_id : std::string(),
+      params->options.decryption_key_id ?
+          *params->options.decryption_key_id : std::string(),
+      params->options.encrypt_type,
+      params->options.sign_type,
       base::Bind(&EasyUnlockPrivateCreateSecureMessageFunction::OnData,
                  this));
   return true;
 }
 
 void EasyUnlockPrivateCreateSecureMessageFunction::OnData(
     const std::string& message) {
   // TODO(tbarzic): Improve error handling.
   if (!message.empty()) {
     results_ = easy_unlock_private::CreateSecureMessage::Results::Create(
         message);
   }
   SendResponse(true);
 }
 
 EasyUnlockPrivateUnwrapSecureMessageFunction::
 EasyUnlockPrivateUnwrapSecureMessageFunction() {}
 
 EasyUnlockPrivateUnwrapSecureMessageFunction::
 ~EasyUnlockPrivateUnwrapSecureMessageFunction() {}
 
 bool EasyUnlockPrivateUnwrapSecureMessageFunction::RunAsync() {
   scoped_ptr<easy_unlock_private::UnwrapSecureMessage::Params> params =
       easy_unlock_private::UnwrapSecureMessage::Params::Create(*args_);
   EXTENSION_FUNCTION_VALIDATE(params);
 
   GetCryptoDelegate(browser_context())->UnwrapSecureMessage(
-      *params,
+      params->secure_message,
+      params->key,
+      params->options.associated_data ?
+          *params->options.associated_data : std::string(),
+      params->options.encrypt_type,
+      params->options.sign_type,
       base::Bind(&EasyUnlockPrivateUnwrapSecureMessageFunction::OnData,
                  this));
   return true;
 }
 
 void EasyUnlockPrivateUnwrapSecureMessageFunction::OnData(
     const std::string& data) {
   // TODO(tbarzic): Improve error handling.
   if (!data.empty())
     results_ = easy_unlock_private::UnwrapSecureMessage::Results::Create(data);
@@ skipping 167 matching lines @@
 bool EasyUnlockPrivateGetRemoteDevicesFunction::RunSync() {
   Profile* profile = Profile::FromBrowserContext(browser_context());
   const base::ListValue* devices =
       EasyUnlockService::Get(profile)->GetRemoteDevices();
   SetResult(devices ? devices->DeepCopy() : new base::ListValue());
   return true;
 }
 
 }  // namespace api
 }  // namespace extensions