CrOS: Add success/failure indicators for biod methods with no callback.

chromeos/dbus/biod/biod_client.cc

Index: chromeos/dbus/biod/biod_client.cc
diff --git a/chromeos/dbus/biod/biod_client.cc b/chromeos/dbus/biod/biod_client.cc
index 5a77c18fdea6ae424d98a9be688f32859a6cfc43..518cb71266b2b744361093ca46c85f39ecdeff73 100644
--- a/chromeos/dbus/biod/biod_client.cc
+++ b/chromeos/dbus/biod/biod_client.cc
@@ -16,6 +16,16 @@
 
 namespace chromeos {
 
+namespace {
+
+// D-Bus response handler for methods that use void callbacks.
+void OnVoidMethod(const VoidDBusMethodCallback& callback,

[Daniel Erat, 2017/04/08 01:13:32]

nit: OnVoidResponse?

[sammiequon, 2017/04/08 01:31:47]

Done.

+                  dbus::Response* response) {
+  callback.Run(response ? DBUS_METHOD_CALL_SUCCESS : DBUS_METHOD_CALL_FAILURE);
+}
+
+}  // namespace
+
 // The BiodClient implementation used in production.
 class BiodClientImpl : public BiodClient {
  public:
@@ -66,14 +76,14 @@ class BiodClientImpl : public BiodClient {
                    weak_ptr_factory_.GetWeakPtr(), callback));
   }
 
-  void DestroyAllRecords() override {
+  void DestroyAllRecords(const VoidDBusMethodCallback& callback) override {
     dbus::MethodCall method_call(
         biod::kBiometricsManagerInterface,
         biod::kBiometricsManagerDestroyAllRecordsMethod);
 
     biod_proxy_->CallMethod(&method_call,
                             dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
-                            dbus::ObjectProxy::EmptyResponseCallback());
+                            base::Bind(&OnVoidMethod, callback));
   }
 
   void StartAuthSession(const ObjectPathCallback& callback) override {
@@ -100,19 +110,20 @@ class BiodClientImpl : public BiodClient {
                    weak_ptr_factory_.GetWeakPtr(), callback));
   }
 
-  void CancelEnrollSession(
-      const dbus::ObjectPath& enroll_session_path) override {
+  void CancelEnrollSession(const dbus::ObjectPath& enroll_session_path,
+                           const VoidDBusMethodCallback& callback) override {
     dbus::MethodCall method_call(biod::kEnrollSessionInterface,
                                  biod::kEnrollSessionCancelMethod);
 
     dbus::ObjectProxy* enroll_session_proxy =
         bus_->GetObjectProxy(biod::kBiodServiceName, enroll_session_path);
-    enroll_session_proxy->CallMethod(
-        &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
-        dbus::ObjectProxy::EmptyResponseCallback());
+    enroll_session_proxy->CallMethod(&method_call,
+                                     dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
+                                     base::Bind(&OnVoidMethod, callback));
   }
 
-  void EndAuthSession(const dbus::ObjectPath& auth_session_path) override {
+  void EndAuthSession(const dbus::ObjectPath& auth_session_path,
+                      const VoidDBusMethodCallback& callback) override {
     dbus::MethodCall method_call(biod::kAuthSessionInterface,
                                  biod::kAuthSessionEndMethod);
 
@@ -120,11 +131,12 @@ class BiodClientImpl : public BiodClient {
         bus_->GetObjectProxy(biod::kBiodServiceName, auth_session_path);
     auth_session_proxy->CallMethod(&method_call,
                                    dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
-                                   dbus::ObjectProxy::EmptyResponseCallback());
+                                   base::Bind(&OnVoidMethod, callback));
   }
 
   void SetRecordLabel(const dbus::ObjectPath& record_path,
-                      const std::string& label) override {
+                      const std::string& label,
+                      const VoidDBusMethodCallback& callback) override {
     dbus::MethodCall method_call(biod::kRecordInterface,
                                  biod::kRecordSetLabelMethod);
     dbus::MessageWriter writer(&method_call);
@@ -134,10 +146,11 @@ class BiodClientImpl : public BiodClient {
         bus_->GetObjectProxy(biod::kBiodServiceName, record_path);
     record_proxy->CallMethod(&method_call,
                              dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
-                             dbus::ObjectProxy::EmptyResponseCallback());
+                             base::Bind(&OnVoidMethod, callback));
   }
 
-  void RemoveRecord(const dbus::ObjectPath& record_path) override {
+  void RemoveRecord(const dbus::ObjectPath& record_path,
+                    const VoidDBusMethodCallback& callback) override {
     dbus::MethodCall method_call(biod::kRecordInterface,
                                  biod::kRecordRemoveMethod);
 
@@ -145,7 +158,7 @@ class BiodClientImpl : public BiodClient {
         bus_->GetObjectProxy(biod::kBiodServiceName, record_path);
     record_proxy->CallMethod(&method_call,
                              dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
-                             dbus::ObjectProxy::EmptyResponseCallback());
+                             base::Bind(&OnVoidMethod, callback));
   }
 
   void RequestRecordLabel(const dbus::ObjectPath& record_path,
@@ -258,18 +271,6 @@ class BiodClientImpl : public BiodClient {
     callback.Run(static_cast<biod::BiometricType>(result));
   }
 
-  void OnRequestRecordLabel(const LabelCallback& callback,

[Daniel Erat, 2017/04/08 01:13:32]

did you re-run the tests? this looks like it was deleted accidentally; it's
still being called.

[sammiequon, 2017/04/08 01:31:47]

Oh no, oops. Good thing you caught it..

-                            dbus::Response* response) {
-    std::string result;
-    if (response) {
-      dbus::MessageReader reader(response);
-      if (!reader.PopString(&result))
-        LOG(ERROR) << biod::kRecordLabelProperty << " had incorrect response.";
-    }
-
-    callback.Run(result);
-  }
-
   // Called when the biometrics signal is initially connected.
   void OnSignalConnected(const std::string& interface_name,
                          const std::string& signal_name,