commit c64fe5e866c5f97a5e5676b28931bc9f6d81946a
author Darin Petkov <petkov@chromium.org> Wed Jan 11 12:46:13 2012 +0100
committer Gerrit <chrome-bot@google.com> Wed Jan 11 08:47:53 2012 -0800
tree 65de356480d8b9f3bd72a69164609594d46fe66c
parent 58a577b23de1478a72135410d146625ffd00e909

shill: Make all device *PIN service methods asynchronous.

BUG=chromium-os:24955
TEST=unit tests

Change-Id: Id7bb736e4d18331440fa6652726f694d01d46a42
Reviewed-on: https://gerrit.chromium.org/gerrit/13977
Tested-by: Darin Petkov <petkov@chromium.org>
Reviewed-by: Eric Shienbrood <ers@chromium.org>
Commit-Ready: Darin Petkov <petkov@chromium.org>

device_dbus_adaptor.cc

diff --git a/device_dbus_adaptor.cc b/device_dbus_adaptor.cc
index ea7e047..f18cae8 100644
--- a/device_dbus_adaptor.cc
+++ b/device_dbus_adaptor.cc
@@ -99,35 +99,35 @@
   e.ToDBusError(&error);
 }
 
-void DeviceDBusAdaptor::RequirePin(const string &pin,
-                                   const bool &require,
-                                   ::DBus::Error &error) {
-  Error e;
-  device_->RequirePIN(pin, require, &e);
-  e.ToDBusError(&error);
+void DeviceDBusAdaptor::RequirePin(
+    const string &pin, const bool &require, DBus::Error &error) {
+  VLOG(2) << __func__;
+  Returner *returner = Returner::Create(this);
+  device_->RequirePIN(pin, require, returner);
+  returner->DelayOrReturn(&error);
 }
 
-void DeviceDBusAdaptor::EnterPin(const string &pin, ::DBus::Error &error) {
+void DeviceDBusAdaptor::EnterPin(const string &pin, DBus::Error &error) {
   VLOG(2) << __func__;
   Returner *returner = Returner::Create(this);
   device_->EnterPIN(pin, returner);
   returner->DelayOrReturn(&error);
 }
 
-void DeviceDBusAdaptor::UnblockPin(const string &unblock_code,
-                                   const string &pin,
-                                   ::DBus::Error &error) {
-  Error e;
-  device_->UnblockPIN(unblock_code, pin, &e);
-  e.ToDBusError(&error);
+void DeviceDBusAdaptor::UnblockPin(
+    const string &unblock_code, const string &pin, DBus::Error &error) {
+  VLOG(2) << __func__;
+  Returner *returner = Returner::Create(this);
+  device_->UnblockPIN(unblock_code, pin, returner);
+  returner->DelayOrReturn(&error);
 }
 
-void DeviceDBusAdaptor::ChangePin(const string &old_pin,
-                                  const string &new_pin,
-                                  ::DBus::Error &error) {
-  Error e;
-  device_->ChangePIN(old_pin, new_pin, &e);
-  e.ToDBusError(&error);
+void DeviceDBusAdaptor::ChangePin(
+    const string &old_pin, const string &new_pin, DBus::Error &error) {
+  VLOG(2) << __func__;
+  Returner *returner = Returner::Create(this);
+  device_->ChangePIN(old_pin, new_pin, returner);
+  returner->DelayOrReturn(&error);
 }
 
 }  // namespace shill