commit 0e9e9d192dbce718ffac7b0adca06e43b95ded39
author mukesh agrawal <quiche@chromium.org> Fri Apr 18 16:09:58 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Wed Apr 23 02:52:16 2014 +0000
tree d73ce87beaa6e9a2b28f856eb0c8ec73a336dab4
parent 5981ecf7ae366f67bfceab545fa84bcfffe9fb85

shill: reduce some copy-paste in dbus proxies

When making asynchronous D-Bus calls, we have to take
care not to leak Callback objects. This code occurs
in many places, but differs only in types.

Factor this code out into a template, to remove code
duplication.

CQ-DEPEND=CL:195761
BUG=chromium:365390
TEST=unit tests

Change-Id: Ica63045a00b9bbd70b3e12cb0939f0d7f1af0e1d
Reviewed-on: https://chromium-review.googlesource.com/195762
Tested-by: mukesh agrawal <quiche@chromium.org>
Reviewed-by: Ben Chan <benchan@chromium.org>
Commit-Queue: mukesh agrawal <quiche@chromium.org>

modem_cdma_proxy.cc

diff --git a/modem_cdma_proxy.cc b/modem_cdma_proxy.cc
index 0656474..b250705 100644
--- a/modem_cdma_proxy.cc
+++ b/modem_cdma_proxy.cc
@@ -5,6 +5,7 @@
 #include "shill/modem_cdma_proxy.h"
 
 #include "shill/cellular_error.h"
+#include "shill/dbus_async_call_helper.h"
 #include "shill/logging.h"
 
 using std::string;
@@ -22,46 +23,24 @@
 void ModemCDMAProxy::Activate(const string &carrier, Error *error,
                               const ActivationResultCallback &callback,
                               int timeout) {
-  scoped_ptr<ActivationResultCallback>
-      cb(new ActivationResultCallback(callback));
-  try {
-    SLOG(DBus, 2) << __func__;
-    proxy_.Activate(carrier, cb.get(), timeout);
-    cb.release();
-  } catch (const DBus::Error &e) {
-    if (error)
-      CellularError::FromDBusError(e, error);
-  }
+  BeginAsyncDBusCall(__func__, proxy_, &Proxy::ActivateAsync, callback,
+                     error, &CellularError::FromDBusError, timeout,
+                     carrier);
 }
 
 void ModemCDMAProxy::GetRegistrationState(
     Error *error,
     const RegistrationStateCallback &callback,
     int timeout) {
-  scoped_ptr<RegistrationStateCallback>
-      cb(new RegistrationStateCallback(callback));
-  try {
-    SLOG(DBus, 2) << __func__;
-    proxy_.GetRegistrationState(cb.get(), timeout);
-    cb.release();
-  } catch (const DBus::Error &e) {
-    if (error)
-      CellularError::FromDBusError(e, error);
-  }
+  BeginAsyncDBusCall(__func__, proxy_, &Proxy::GetRegistrationStateAsync,
+                     callback, error, &CellularError::FromDBusError, timeout);
 }
 
 void ModemCDMAProxy::GetSignalQuality(Error *error,
                                       const SignalQualityCallback &callback,
                                       int timeout) {
-  scoped_ptr<SignalQualityCallback> cb(new SignalQualityCallback(callback));
-  try {
-    SLOG(DBus, 2) << __func__;
-    proxy_.GetSignalQuality(cb.get(), timeout);
-    cb.release();
-  } catch (const DBus::Error &e) {
-    if (error)
-      CellularError::FromDBusError(e, error);
-  }
+  BeginAsyncDBusCall(__func__, proxy_, &Proxy::GetSignalQualityAsync, callback,
+                     error, &CellularError::FromDBusError, timeout);
 }
 
 const string ModemCDMAProxy::MEID() {