chromeos: Move common D-Bus method callbacks to dbus_method_call_status.h

BUG=None
TEST=build success


Review URL: https://chromiumcodereview.appspot.com/10827067

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149376 0039d316-1c4b-4281-b951-d872f2087c98

22 files changed, 191 insertions, 167 deletions

diff --git a/chromeos/dbus/cryptohome_client.cc b/chromeos/dbus/cryptohome_client.cc
index 8da8a8b..a5a0346 100644
--- a/chromeos/dbus/cryptohome_client.cc
+++ b/chromeos/dbus/cryptohome_client.cc
@@ -53,7 +53,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
   }
 
   // CryptohomeClient override.
-  virtual void IsMounted(const BoolMethodCallback& callback) {
+  virtual void IsMounted(const BoolDBusMethodCallback& callback) {
     INITIALIZE_METHOD_CALL(method_call, cryptohome::kCryptohomeIsMounted);
     CallBoolMethod(&method_call, callback);
   }
@@ -151,13 +151,13 @@ class CryptohomeClientImpl : public CryptohomeClient {
   }
 
   // CryptohomeClient override.
-  virtual void TpmIsReady(const BoolMethodCallback& callback) OVERRIDE {
+  virtual void TpmIsReady(const BoolDBusMethodCallback& callback) OVERRIDE {
     INITIALIZE_METHOD_CALL(method_call, cryptohome::kCryptohomeTpmIsReady);
     CallBoolMethod(&method_call, callback);
   }
 
   // CryptohomeClient override.
-  virtual void TpmIsEnabled(const BoolMethodCallback& callback) OVERRIDE {
+  virtual void TpmIsEnabled(const BoolDBusMethodCallback& callback) OVERRIDE {
     INITIALIZE_METHOD_CALL(method_call, cryptohome::kCryptohomeTpmIsEnabled);
     CallBoolMethod(&method_call, callback);
   }
@@ -173,7 +173,8 @@ class CryptohomeClientImpl : public CryptohomeClient {
   }
 
   // CryptohomeClient override.
-  virtual void TpmGetPassword(const StringMethodCallback& callback) OVERRIDE {
+  virtual void TpmGetPassword(
+      const StringDBusMethodCallback& callback) OVERRIDE {
     INITIALIZE_METHOD_CALL(method_call, cryptohome::kCryptohomeTpmGetPassword);
     proxy_->CallMethod(
         &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
@@ -196,7 +197,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
 
   // CryptohomeClient override.
   virtual void TpmCanAttemptOwnership(
-      const VoidMethodCallback& callback) OVERRIDE {
+      const VoidDBusMethodCallback& callback) OVERRIDE {
     INITIALIZE_METHOD_CALL(method_call,
                            cryptohome::kCryptohomeTpmCanAttemptOwnership);
     CallVoidMethod(&method_call, callback);
@@ -212,7 +213,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
   }
 
   // CryptohomeClient override.
-  virtual void Pkcs11IsTpmTokenReady(const BoolMethodCallback& callback)
+  virtual void Pkcs11IsTpmTokenReady(const BoolDBusMethodCallback& callback)
       OVERRIDE {
     INITIALIZE_METHOD_CALL(method_call,
                            cryptohome::kCryptohomePkcs11IsTpmTokenReady);
@@ -312,14 +313,14 @@ class CryptohomeClientImpl : public CryptohomeClient {
 
   // Calls a method without result values.
   void CallVoidMethod(dbus::MethodCall* method_call,
-                      const VoidMethodCallback& callback) {
+                      const VoidDBusMethodCallback& callback) {
     proxy_->CallMethod(method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
                        base::Bind(&CryptohomeClientImpl::OnVoidMethod,
                                   weak_ptr_factory_.GetWeakPtr(),
                                   callback));
   }
 
-  void OnVoidMethod(const VoidMethodCallback& callback,
+  void OnVoidMethod(const VoidDBusMethodCallback& callback,
                     dbus::Response* response) {
     if (!response) {
       callback.Run(DBUS_METHOD_CALL_FAILURE);
@@ -341,7 +342,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
 
   // Calls a method with a bool value result.
   void CallBoolMethod(dbus::MethodCall* method_call,
-                      const BoolMethodCallback& callback) {
+                      const BoolDBusMethodCallback& callback) {
     proxy_->CallMethod(method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
                        base::Bind(
                            &CryptohomeClientImpl::OnBoolMethod,
@@ -350,7 +351,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
   }
 
   // Handles responses for methods with a bool value result.
-  void OnBoolMethod(const BoolMethodCallback& callback,
+  void OnBoolMethod(const BoolDBusMethodCallback& callback,
                     dbus::Response* response) {
     if (!response) {
       callback.Run(DBUS_METHOD_CALL_FAILURE, false);
@@ -366,7 +367,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
   }
 
   // Handles responses for methods with a string value result.
-  void OnStringMethod(const StringMethodCallback& callback,
+  void OnStringMethod(const StringDBusMethodCallback& callback,
                       dbus::Response* response) {
     if (!response) {
       callback.Run(DBUS_METHOD_CALL_FAILURE, std::string());
@@ -454,7 +455,7 @@ class CryptohomeClientStubImpl : public CryptohomeClient {
   }
 
   // CryptohomeClient override.
-  virtual void IsMounted(const BoolMethodCallback& callback) OVERRIDE {
+  virtual void IsMounted(const BoolDBusMethodCallback& callback) OVERRIDE {
     MessageLoop::current()->PostTask(
         FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS, true));
   }
@@ -508,13 +509,13 @@ class CryptohomeClientStubImpl : public CryptohomeClient {
   }
 
   // CryptohomeClient override.
-  virtual void TpmIsReady(const BoolMethodCallback& callback) OVERRIDE {
+  virtual void TpmIsReady(const BoolDBusMethodCallback& callback) OVERRIDE {
     MessageLoop::current()->PostTask(
         FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS, true));
   }
 
   // CryptohomeClient override.
-  virtual void TpmIsEnabled(const BoolMethodCallback& callback) OVERRIDE {
+  virtual void TpmIsEnabled(const BoolDBusMethodCallback& callback) OVERRIDE {
     MessageLoop::current()->PostTask(
         FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS, true));
   }
@@ -526,7 +527,8 @@ class CryptohomeClientStubImpl : public CryptohomeClient {
   }
 
   // CryptohomeClient override.
-  virtual void TpmGetPassword(const StringMethodCallback& callback) OVERRIDE {
+  virtual void TpmGetPassword(
+      const StringDBusMethodCallback& callback) OVERRIDE {
     const char kStubTpmPassword[] = "Stub-TPM-password";
     MessageLoop::current()->PostTask(
         FROM_HERE,
@@ -547,7 +549,7 @@ class CryptohomeClientStubImpl : public CryptohomeClient {
 
   // CryptohomeClient override.
   virtual void TpmCanAttemptOwnership(
-      const VoidMethodCallback& callback) OVERRIDE {
+      const VoidDBusMethodCallback& callback) OVERRIDE {
     MessageLoop::current()->PostTask(
         FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS));
   }
@@ -557,7 +559,7 @@ class CryptohomeClientStubImpl : public CryptohomeClient {
 
   // CryptohomeClient override.
   virtual void Pkcs11IsTpmTokenReady(
-      const BoolMethodCallback& callback) OVERRIDE {
+      const BoolDBusMethodCallback& callback) OVERRIDE {
     MessageLoop::current()->PostTask(
         FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS, true));
   }
diff --git a/chromeos/dbus/cryptohome_client.h b/chromeos/dbus/cryptohome_client.h
index f4a86837..7671783 100644
--- a/chromeos/dbus/cryptohome_client.h
+++ b/chromeos/dbus/cryptohome_client.h
@@ -30,15 +30,6 @@ class CHROMEOS_EXPORT CryptohomeClient {
                          > AsyncCallStatusHandler;
   // A callback to handle responses of AsyncXXX methods.
   typedef base::Callback<void(int async_id)> AsyncMethodCallback;
-  // A callback to handle responses of methods without result values.
-  typedef base::Callback<void(
-      DBusMethodCallStatus call_status)> VoidMethodCallback;
-  // A callback to handle responses of methods returning a bool value.
-  typedef base::Callback<void(DBusMethodCallStatus call_status,
-                              bool result)> BoolMethodCallback;
-  // A callback to handle responses of methods returning a string value.
-  typedef base::Callback<void(DBusMethodCallStatus call_status,
-                              const std::string& result)> StringMethodCallback;
   // A callback to handle responses of Pkcs11GetTpmTokenInfo method.
   typedef base::Callback<void(
       DBusMethodCallStatus call_status,
@@ -63,7 +54,7 @@ class CHROMEOS_EXPORT CryptohomeClient {
   virtual void ResetAsyncCallStatusHandler() = 0;
 
   // Calls IsMounted method and returns true when the call succeeds.
-  virtual void IsMounted(const BoolMethodCallback& callback) = 0;
+  virtual void IsMounted(const BoolDBusMethodCallback& callback) = 0;
 
   // Calls Unmount method and returns true when the call succeeds.
   // This method blocks until the call returns.
@@ -103,10 +94,10 @@ class CHROMEOS_EXPORT CryptohomeClient {
   virtual void AsyncMountGuest(const AsyncMethodCallback& callback) = 0;
 
   // Calls TpmIsReady method.
-  virtual void TpmIsReady(const BoolMethodCallback& callback) = 0;
+  virtual void TpmIsReady(const BoolDBusMethodCallback& callback) = 0;
 
   // Calls TpmIsEnabled method.
-  virtual void TpmIsEnabled(const BoolMethodCallback& callback) = 0;
+  virtual void TpmIsEnabled(const BoolDBusMethodCallback& callback) = 0;
 
   // Calls TpmIsEnabled method and returns true when the call succeeds.
   // This method blocks until the call returns.
@@ -114,7 +105,7 @@ class CHROMEOS_EXPORT CryptohomeClient {
   virtual bool CallTpmIsEnabledAndBlock(bool* enabled) = 0;
 
   // Calls TpmGetPassword method.
-  virtual void TpmGetPassword(const StringMethodCallback& callback) = 0;
+  virtual void TpmGetPassword(const StringDBusMethodCallback& callback) = 0;
 
   // Calls TpmIsOwned method and returns true when the call succeeds.
   // This method blocks until the call returns.
@@ -126,14 +117,16 @@ class CHROMEOS_EXPORT CryptohomeClient {
 
   // Calls TpmCanAttemptOwnership method.
   // This method tells the service that it is OK to attempt ownership.
-  virtual void TpmCanAttemptOwnership(const VoidMethodCallback& callback) = 0;
+  virtual void TpmCanAttemptOwnership(
+      const VoidDBusMethodCallback& callback) = 0;
 
   // Calls TpmClearStoredPassword method and returns true when the call
   // succeeds.  This method blocks until the call returns.
   virtual bool TpmClearStoredPassword() = 0;
 
   // Calls Pkcs11IsTpmTokenReady method.
-  virtual void Pkcs11IsTpmTokenReady(const BoolMethodCallback& callback) = 0;
+  virtual void Pkcs11IsTpmTokenReady(
+      const BoolDBusMethodCallback& callback) = 0;
 
   // Calls Pkcs11GetTpmTokenInfo method.
   virtual void Pkcs11GetTpmTokenInfo(
diff --git a/chromeos/dbus/dbus_method_call_status.h b/chromeos/dbus/dbus_method_call_status.h
index 6cfb11e..a45611e 100644
--- a/chromeos/dbus/dbus_method_call_status.h
+++ b/chromeos/dbus/dbus_method_call_status.h
@@ -5,6 +5,14 @@
 #ifndef CHROMEOS_DBUS_DBUS_METHOD_CALL_STATUS_H_
 #define CHROMEOS_DBUS_DBUS_METHOD_CALL_STATUS_H_
 
+#include "base/callback.h"
+
+namespace dbus {
+
+class ObjectPath;
+
+}  // namespace dbus
+
 namespace chromeos {
 
 // An enum to describe whether or not a DBus method call succeeded.
@@ -13,6 +21,24 @@ enum DBusMethodCallStatus {
   DBUS_METHOD_CALL_SUCCESS,
 };
 
-}  // namespace
+// A callback to handle responses of methods without results.
+typedef base::Callback<void(
+    DBusMethodCallStatus call_status)> VoidDBusMethodCallback;
+
+// A callback to handle responses of methods returning a bool value.
+typedef base::Callback<void(DBusMethodCallStatus call_status,
+                            bool result)> BoolDBusMethodCallback;
+
+// A callback to handle responses of methods returning a string value.
+typedef base::Callback<void(
+    DBusMethodCallStatus call_status,
+    const std::string& result)> StringDBusMethodCallback;
+
+// A callback to handle responses of methods returning a ObjectPath value.
+typedef base::Callback<void(
+    DBusMethodCallStatus call_status,
+    const dbus::ObjectPath& result)> ObjectPathDBusMethodCallback;
+
+}  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_DBUS_METHOD_CALL_STATUS_H_
diff --git a/chromeos/dbus/flimflam_client_helper.cc b/chromeos/dbus/flimflam_client_helper.cc
index b54bb94..6e9cef3 100644
--- a/chromeos/dbus/flimflam_client_helper.cc
+++ b/chromeos/dbus/flimflam_client_helper.cc
@@ -44,8 +44,9 @@ void FlimflamClientHelper::MonitorPropertyChanged(
                                      weak_ptr_factory_.GetWeakPtr()));
 }
 
-void FlimflamClientHelper::CallVoidMethod(dbus::MethodCall* method_call,
-                                          const VoidCallback& callback) {
+void FlimflamClientHelper::CallVoidMethod(
+    dbus::MethodCall* method_call,
+    const VoidDBusMethodCallback& callback) {
   proxy_->CallMethod(method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
                      base::Bind(&FlimflamClientHelper::OnVoidMethod,
                                 weak_ptr_factory_.GetWeakPtr(),
@@ -54,7 +55,7 @@ void FlimflamClientHelper::CallVoidMethod(dbus::MethodCall* method_call,
 
 void FlimflamClientHelper::CallObjectPathMethod(
     dbus::MethodCall* method_call,
-    const ObjectPathCallback& callback) {
+    const ObjectPathDBusMethodCallback& callback) {
   proxy_->CallMethod(method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
                      base::Bind(&FlimflamClientHelper::OnObjectPathMethod,
                                 weak_ptr_factory_.GetWeakPtr(),
@@ -204,7 +205,7 @@ void FlimflamClientHelper::OnPropertyChanged(dbus::Signal* signal) {
   property_changed_handler_.Run(name, *value);
 }
 
-void FlimflamClientHelper::OnVoidMethod(const VoidCallback& callback,
+void FlimflamClientHelper::OnVoidMethod(const VoidDBusMethodCallback& callback,
                                         dbus::Response* response) {
   if (!response) {
     callback.Run(DBUS_METHOD_CALL_FAILURE);
@@ -214,7 +215,7 @@ void FlimflamClientHelper::OnVoidMethod(const VoidCallback& callback,
 }
 
 void FlimflamClientHelper::OnObjectPathMethod(
-    const ObjectPathCallback& callback,
+    const ObjectPathDBusMethodCallback& callback,
     dbus::Response* response) {
   if (!response) {
     callback.Run(DBUS_METHOD_CALL_FAILURE, dbus::ObjectPath());
diff --git a/chromeos/dbus/flimflam_client_helper.h b/chromeos/dbus/flimflam_client_helper.h
index 671f3c2..824096b 100644
--- a/chromeos/dbus/flimflam_client_helper.h
+++ b/chromeos/dbus/flimflam_client_helper.h
@@ -42,14 +42,6 @@ class FlimflamClientHelper {
   typedef base::Callback<void(const std::string& name,
                               const base::Value& value)> PropertyChangedHandler;
 
-  // A callback to handle responses for methods without results.
-  typedef base::Callback<void(DBusMethodCallStatus call_status)> VoidCallback;
-
-  // A callback to handle responses for methods with ObjectPath results.
-  typedef base::Callback<void(
-      DBusMethodCallStatus call_status,
-      const dbus::ObjectPath& result)> ObjectPathCallback;
-
   // A callback to handle responses for methods with DictionaryValue results.
   typedef base::Callback<void(
       DBusMethodCallStatus call_status,
@@ -79,11 +71,11 @@ class FlimflamClientHelper {
 
   // Calls a method without results.
   void CallVoidMethod(dbus::MethodCall* method_call,
-                      const VoidCallback& callback);
+                      const VoidDBusMethodCallback& callback);
 
   // Calls a method with an object path result.
   void CallObjectPathMethod(dbus::MethodCall* method_call,
-                            const ObjectPathCallback& callback);
+                            const ObjectPathDBusMethodCallback& callback);
 
   // Calls a method with a dictionary value result.
   void CallDictionaryValueMethod(dbus::MethodCall* method_call,
@@ -127,10 +119,11 @@ class FlimflamClientHelper {
   void OnPropertyChanged(dbus::Signal* signal);
 
   // Handles responses for methods without results.
-  void OnVoidMethod(const VoidCallback& callback, dbus::Response* response);
+  void OnVoidMethod(const VoidDBusMethodCallback& callback,
+                    dbus::Response* response);
 
   // Handles responses for methods with ObjectPath results.
-  void OnObjectPathMethod(const ObjectPathCallback& callback,
+  void OnObjectPathMethod(const ObjectPathDBusMethodCallback& callback,
                           dbus::Response* response);
 
   // Handles responses for methods with DictionaryValue results.
diff --git a/chromeos/dbus/flimflam_device_client.cc b/chromeos/dbus/flimflam_device_client.cc
index 8474c18..aab8dab 100644
--- a/chromeos/dbus/flimflam_device_client.cc
+++ b/chromeos/dbus/flimflam_device_client.cc
@@ -59,7 +59,7 @@ class FlimflamDeviceClientImpl : public FlimflamDeviceClient {
 
   // FlimflamProfileClient override.
   virtual void ProposeScan(const dbus::ObjectPath& device_path,
-                           const VoidCallback& callback) OVERRIDE {
+                           const VoidDBusMethodCallback& callback) OVERRIDE {
     dbus::MethodCall method_call(flimflam::kFlimflamDeviceInterface,
                                  flimflam::kProposeScanFunction);
     GetHelper(device_path)->CallVoidMethod(&method_call, callback);
@@ -69,7 +69,7 @@ class FlimflamDeviceClientImpl : public FlimflamDeviceClient {
   virtual void SetProperty(const dbus::ObjectPath& device_path,
                            const std::string& name,
                            const base::Value& value,
-                           const VoidCallback& callback) OVERRIDE {
+                           const VoidDBusMethodCallback& callback) OVERRIDE {
     dbus::MethodCall method_call(flimflam::kFlimflamDeviceInterface,
                                  flimflam::kSetPropertyFunction);
     dbus::MessageWriter writer(&method_call);
@@ -81,7 +81,7 @@ class FlimflamDeviceClientImpl : public FlimflamDeviceClient {
   // FlimflamProfileClient override.
   virtual void ClearProperty(const dbus::ObjectPath& device_path,
                              const std::string& name,
-                             const VoidCallback& callback) OVERRIDE {
+                             const VoidDBusMethodCallback& callback) OVERRIDE {
     dbus::MethodCall method_call(flimflam::kFlimflamDeviceInterface,
                                  flimflam::kClearPropertyFunction);
     dbus::MessageWriter writer(&method_call);
@@ -90,9 +90,10 @@ class FlimflamDeviceClientImpl : public FlimflamDeviceClient {
   }
 
   // FlimflamProfileClient override.
-  virtual void AddIPConfig(const dbus::ObjectPath& device_path,
-                           const std::string& method,
-                           const ObjectPathCallback& callback) OVERRIDE {
+  virtual void AddIPConfig(
+      const dbus::ObjectPath& device_path,
+      const std::string& method,
+      const ObjectPathDBusMethodCallback& callback) OVERRIDE {
     dbus::MethodCall method_call(flimflam::kFlimflamDeviceInterface,
                                  flimflam::kAddIPConfigFunction);
     dbus::MessageWriter writer(&method_call);
@@ -273,7 +274,7 @@ class FlimflamDeviceClientStubImpl : public FlimflamDeviceClient {
 
   // FlimflamProfileClient override.
   virtual void ProposeScan(const dbus::ObjectPath& device_path,
-                           const VoidCallback& callback) OVERRIDE {
+                           const VoidDBusMethodCallback& callback) OVERRIDE {
     PostVoidCallback(callback, DBUS_METHOD_CALL_SUCCESS);
   }
 
@@ -281,7 +282,7 @@ class FlimflamDeviceClientStubImpl : public FlimflamDeviceClient {
   virtual void SetProperty(const dbus::ObjectPath& device_path,
                            const std::string& name,
                            const base::Value& value,
-                           const VoidCallback& callback) OVERRIDE {
+                           const VoidDBusMethodCallback& callback) OVERRIDE {
     base::DictionaryValue* device_properties = NULL;
     if (!stub_devices_.GetDictionary(device_path.value(), &device_properties)) {
       PostVoidCallback(callback, DBUS_METHOD_CALL_FAILURE);
@@ -294,7 +295,7 @@ class FlimflamDeviceClientStubImpl : public FlimflamDeviceClient {
   // FlimflamDeviceClient override.
   virtual void ClearProperty(const dbus::ObjectPath& device_path,
                              const std::string& name,
-                             const VoidCallback& callback) OVERRIDE {
+                             const VoidDBusMethodCallback& callback) OVERRIDE {
     base::DictionaryValue* device_properties = NULL;
     if (!stub_devices_.GetDictionary(device_path.value(), &device_properties)) {
       PostVoidCallback(callback, DBUS_METHOD_CALL_FAILURE);
@@ -305,9 +306,10 @@ class FlimflamDeviceClientStubImpl : public FlimflamDeviceClient {
   }
 
   // FlimflamDeviceClient override.
-  virtual void AddIPConfig(const dbus::ObjectPath& device_path,
-                           const std::string& method,
-                           const ObjectPathCallback& callback) OVERRIDE {
+  virtual void AddIPConfig(
+      const dbus::ObjectPath& device_path,
+      const std::string& method,
+      const ObjectPathDBusMethodCallback& callback) OVERRIDE {
     MessageLoop::current()->PostTask(FROM_HERE,
                                      base::Bind(callback,
                                                 DBUS_METHOD_CALL_SUCCESS,
@@ -377,7 +379,7 @@ class FlimflamDeviceClientStubImpl : public FlimflamDeviceClient {
   }
 
   // Posts a task to run a void callback with status code |status|.
-  void PostVoidCallback(const VoidCallback& callback,
+  void PostVoidCallback(const VoidDBusMethodCallback& callback,
                         DBusMethodCallStatus status) {
     MessageLoop::current()->PostTask(FROM_HERE,
                                      base::Bind(callback, status));
diff --git a/chromeos/dbus/flimflam_device_client.h b/chromeos/dbus/flimflam_device_client.h
index 5fe545f..46cf0057 100644
--- a/chromeos/dbus/flimflam_device_client.h
+++ b/chromeos/dbus/flimflam_device_client.h
@@ -35,8 +35,6 @@ namespace chromeos {
 class CHROMEOS_EXPORT FlimflamDeviceClient {
  public:
   typedef FlimflamClientHelper::PropertyChangedHandler PropertyChangedHandler;
-  typedef FlimflamClientHelper::VoidCallback VoidCallback;
-  typedef FlimflamClientHelper::ObjectPathCallback ObjectPathCallback;
   typedef FlimflamClientHelper::DictionaryValueCallback DictionaryValueCallback;
   typedef FlimflamClientHelper::ErrorCallback ErrorCallback;
 
@@ -73,26 +71,26 @@ class CHROMEOS_EXPORT FlimflamDeviceClient {
   // Calls ProposeScan method.
   // |callback| is called after the method call finishes.
   virtual void ProposeScan(const dbus::ObjectPath& device_path,
-                           const VoidCallback& callback) = 0;
+                           const VoidDBusMethodCallback& callback) = 0;
 
   // Calls SetProperty method.
   // |callback| is called after the method call finishes.
   virtual void SetProperty(const dbus::ObjectPath& device_path,
                            const std::string& name,
                            const base::Value& value,
-                           const VoidCallback& callback) = 0;
+                           const VoidDBusMethodCallback& callback) = 0;
 
   // Calls ClearProperty method.
   // |callback| is called after the method call finishes.
   virtual void ClearProperty(const dbus::ObjectPath& device_path,
                              const std::string& name,
-                             const VoidCallback& callback) = 0;
+                             const VoidDBusMethodCallback& callback) = 0;
 
   // Calls AddIPConfig method.
   // |callback| is called after the method call finishes.
   virtual void AddIPConfig(const dbus::ObjectPath& device_path,
                            const std::string& method,
-                           const ObjectPathCallback& callback) = 0;
+                           const ObjectPathDBusMethodCallback& callback) = 0;
 
   // DEPRECATED DO NOT USE: Calls AddIPConfig method and blocks until the method
   // call finishes.
diff --git a/chromeos/dbus/flimflam_ipconfig_client.cc b/chromeos/dbus/flimflam_ipconfig_client.cc
index dc25e0b..a2b6dc7 100644
--- a/chromeos/dbus/flimflam_ipconfig_client.cc
+++ b/chromeos/dbus/flimflam_ipconfig_client.cc
@@ -37,12 +37,12 @@ class FlimflamIPConfigClientImpl : public FlimflamIPConfigClient {
   virtual void SetProperty(const dbus::ObjectPath& ipconfig_path,
                            const std::string& name,
                            const base::Value& value,
-                           const VoidCallback& callback) OVERRIDE;
+                           const VoidDBusMethodCallback& callback) OVERRIDE;
   virtual void ClearProperty(const dbus::ObjectPath& ipconfig_path,
                              const std::string& name,
-                             const VoidCallback& callback) OVERRIDE;
+                             const VoidDBusMethodCallback& callback) OVERRIDE;
   virtual void Remove(const dbus::ObjectPath& ipconfig_path,
-                      const VoidCallback& callback) OVERRIDE;
+                      const VoidDBusMethodCallback& callback) OVERRIDE;
   virtual bool CallRemoveAndBlock(
       const dbus::ObjectPath& ipconfig_path) OVERRIDE;
 
@@ -107,7 +107,7 @@ void FlimflamIPConfigClientImpl::SetProperty(
     const dbus::ObjectPath& ipconfig_path,
     const std::string& name,
     const base::Value& value,
-    const VoidCallback& callback) {
+    const VoidDBusMethodCallback& callback) {
   dbus::MethodCall method_call(flimflam::kFlimflamIPConfigInterface,
                                flimflam::kSetPropertyFunction);
   dbus::MessageWriter writer(&method_call);
@@ -148,7 +148,7 @@ void FlimflamIPConfigClientImpl::SetProperty(
 void FlimflamIPConfigClientImpl::ClearProperty(
     const dbus::ObjectPath& ipconfig_path,
     const std::string& name,
-    const VoidCallback& callback) {
+    const VoidDBusMethodCallback& callback) {
   dbus::MethodCall method_call(flimflam::kFlimflamIPConfigInterface,
                                flimflam::kClearPropertyFunction);
   dbus::MessageWriter writer(&method_call);
@@ -156,8 +156,9 @@ void FlimflamIPConfigClientImpl::ClearProperty(
   GetHelper(ipconfig_path)->CallVoidMethod(&method_call, callback);
 }
 
-void FlimflamIPConfigClientImpl::Remove(const dbus::ObjectPath& ipconfig_path,
-                                        const VoidCallback& callback) {
+void FlimflamIPConfigClientImpl::Remove(
+    const dbus::ObjectPath& ipconfig_path,
+    const VoidDBusMethodCallback& callback) {
   dbus::MethodCall method_call(flimflam::kFlimflamIPConfigInterface,
                                flimflam::kRemoveConfigFunction);
   GetHelper(ipconfig_path)->CallVoidMethod(&method_call, callback);
@@ -205,7 +206,7 @@ class FlimflamIPConfigClientStubImpl : public FlimflamIPConfigClient {
   virtual void SetProperty(const dbus::ObjectPath& ipconfig_path,
                            const std::string& name,
                            const base::Value& value,
-                           const VoidCallback& callback) OVERRIDE {
+                           const VoidDBusMethodCallback& callback) OVERRIDE {
     MessageLoop::current()->PostTask(
         FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS));
   }
@@ -213,14 +214,14 @@ class FlimflamIPConfigClientStubImpl : public FlimflamIPConfigClient {
   // FlimflamIPConfigClient override.
   virtual void ClearProperty(const dbus::ObjectPath& ipconfig_path,
                              const std::string& name,
-                             const VoidCallback& callback) OVERRIDE {
+                             const VoidDBusMethodCallback& callback) OVERRIDE {
     MessageLoop::current()->PostTask(
         FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS));
   }
 
   // FlimflamIPConfigClient override.
   virtual void Remove(const dbus::ObjectPath& ipconfig_path,
-                      const VoidCallback& callback) OVERRIDE {
+                      const VoidDBusMethodCallback& callback) OVERRIDE {
     MessageLoop::current()->PostTask(
         FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS));
   }
diff --git a/chromeos/dbus/flimflam_ipconfig_client.h b/chromeos/dbus/flimflam_ipconfig_client.h
index 0b2dba8..19e9a98 100644
--- a/chromeos/dbus/flimflam_ipconfig_client.h
+++ b/chromeos/dbus/flimflam_ipconfig_client.h
@@ -35,7 +35,6 @@ namespace chromeos {
 class CHROMEOS_EXPORT FlimflamIPConfigClient {
  public:
   typedef FlimflamClientHelper::PropertyChangedHandler PropertyChangedHandler;
-  typedef FlimflamClientHelper::VoidCallback VoidCallback;
   typedef FlimflamClientHelper::DictionaryValueCallback DictionaryValueCallback;
   virtual ~FlimflamIPConfigClient();
 
@@ -72,18 +71,18 @@ class CHROMEOS_EXPORT FlimflamIPConfigClient {
   virtual void SetProperty(const dbus::ObjectPath& ipconfig_path,
                            const std::string& name,
                            const base::Value& value,
-                           const VoidCallback& callback) = 0;
+                           const VoidDBusMethodCallback& callback) = 0;
 
   // Calls ClearProperty method.
   // |callback| is called after the method call succeeds.
   virtual void ClearProperty(const dbus::ObjectPath& ipconfig_path,
                              const std::string& name,
-                             const VoidCallback& callback) = 0;
+                             const VoidDBusMethodCallback& callback) = 0;
 
   // Calls Remove method.
   // |callback| is called after the method call succeeds.
   virtual void Remove(const dbus::ObjectPath& ipconfig_path,
-                      const VoidCallback& callback) = 0;
+                      const VoidDBusMethodCallback& callback) = 0;
 
   // DEPRECATED DO NOT USE: Calls Remove method and blocks until the method call
   // finishes.
diff --git a/chromeos/dbus/flimflam_manager_client.cc b/chromeos/dbus/flimflam_manager_client.cc
index 4bbc131f..e7cfacb 100644
--- a/chromeos/dbus/flimflam_manager_client.cc
+++ b/chromeos/dbus/flimflam_manager_client.cc
@@ -81,7 +81,7 @@ class FlimflamManagerClientImpl : public FlimflamManagerClient {
 
   virtual void SetProperty(const std::string& name,
                            const base::Value& value,
-                           const VoidCallback& callback) OVERRIDE {
+                           const VoidDBusMethodCallback& callback) OVERRIDE {
     dbus::MethodCall method_call(flimflam::kFlimflamManagerInterface,
                                  flimflam::kSetPropertyFunction);
     dbus::MessageWriter writer(&method_call);
@@ -91,7 +91,7 @@ class FlimflamManagerClientImpl : public FlimflamManagerClient {
   }
 
   virtual void RequestScan(const std::string& type,
-                           const VoidCallback& callback) OVERRIDE {
+                           const VoidDBusMethodCallback& callback) OVERRIDE {
     dbus::MethodCall method_call(flimflam::kFlimflamManagerInterface,
                                  flimflam::kRequestScanFunction);
     dbus::MessageWriter writer(&method_call);
@@ -99,8 +99,9 @@ class FlimflamManagerClientImpl : public FlimflamManagerClient {
     helper_.CallVoidMethod(&method_call, callback);
   }
 
-  virtual void EnableTechnology(const std::string& type,
-                                const VoidCallback& callback) OVERRIDE {
+  virtual void EnableTechnology(
+      const std::string& type,
+      const VoidDBusMethodCallback& callback) OVERRIDE {
     dbus::MethodCall method_call(flimflam::kFlimflamManagerInterface,
                                  flimflam::kEnableTechnologyFunction);
     dbus::MessageWriter writer(&method_call);
@@ -108,8 +109,9 @@ class FlimflamManagerClientImpl : public FlimflamManagerClient {
     helper_.CallVoidMethod(&method_call, callback);
   }
 
-  virtual void DisableTechnology(const std::string& type,
-                                 const VoidCallback& callback) OVERRIDE {
+  virtual void DisableTechnology(
+      const std::string& type,
+      const VoidDBusMethodCallback& callback) OVERRIDE {
     dbus::MethodCall method_call(flimflam::kFlimflamManagerInterface,
                                  flimflam::kDisableTechnologyFunction);
     dbus::MessageWriter writer(&method_call);
@@ -117,8 +119,9 @@ class FlimflamManagerClientImpl : public FlimflamManagerClient {
     helper_.CallVoidMethod(&method_call, callback);
   }
 
-  virtual void ConfigureService(const base::DictionaryValue& properties,
-                                const VoidCallback& callback) OVERRIDE {
+  virtual void ConfigureService(
+      const base::DictionaryValue& properties,
+      const VoidDBusMethodCallback& callback) OVERRIDE {
     DCHECK(AreServicePropertiesValid(properties));
     dbus::MethodCall method_call(flimflam::kFlimflamManagerInterface,
                                  flimflam::kConfigureServiceFunction);
@@ -127,8 +130,9 @@ class FlimflamManagerClientImpl : public FlimflamManagerClient {
     helper_.CallVoidMethod(&method_call, callback);
   }
 
-  virtual void GetService(const base::DictionaryValue& properties,
-                          const ObjectPathCallback& callback) OVERRIDE {
+  virtual void GetService(
+      const base::DictionaryValue& properties,
+      const ObjectPathDBusMethodCallback& callback) OVERRIDE {
     dbus::MethodCall method_call(flimflam::kFlimflamManagerInterface,
                                  flimflam::kGetServiceFunction);
     dbus::MessageWriter writer(&method_call);
@@ -183,7 +187,7 @@ class FlimflamManagerClientStubImpl : public FlimflamManagerClient {
   // FlimflamManagerClient override.
   virtual void SetProperty(const std::string& name,
                            const base::Value& value,
-                           const VoidCallback& callback) OVERRIDE {
+                           const VoidDBusMethodCallback& callback) OVERRIDE {
     stub_properties_.Set(name, value.DeepCopy());
     MessageLoop::current()->PostTask(FROM_HERE,
                                      base::Bind(callback,
@@ -192,39 +196,43 @@ class FlimflamManagerClientStubImpl : public FlimflamManagerClient {
 
   // FlimflamManagerClient override.
   virtual void RequestScan(const std::string& type,
-                           const VoidCallback& callback) OVERRIDE {
+                           const VoidDBusMethodCallback& callback) OVERRIDE {
     MessageLoop::current()->PostTask(FROM_HERE,
                                      base::Bind(callback,
                                                 DBUS_METHOD_CALL_SUCCESS));
   }
 
   // FlimflamManagerClient override.
-  virtual void EnableTechnology(const std::string& type,
-                                const VoidCallback& callback) OVERRIDE {
+  virtual void EnableTechnology(
+      const std::string& type,
+      const VoidDBusMethodCallback& callback) OVERRIDE {
     MessageLoop::current()->PostTask(FROM_HERE,
                                      base::Bind(callback,
                                                 DBUS_METHOD_CALL_SUCCESS));
   }
 
   // FlimflamManagerClient override.
-  virtual void DisableTechnology(const std::string& type,
-                                 const VoidCallback& callback) OVERRIDE {
+  virtual void DisableTechnology(
+      const std::string& type,
+      const VoidDBusMethodCallback& callback) OVERRIDE {
     MessageLoop::current()->PostTask(FROM_HERE,
                                      base::Bind(callback,
                                                 DBUS_METHOD_CALL_SUCCESS));
   }
 
   // FlimflamManagerClient override.
-  virtual void ConfigureService(const base::DictionaryValue& properties,
-                                const VoidCallback& callback) OVERRIDE {
+  virtual void ConfigureService(
+      const base::DictionaryValue& properties,
+      const VoidDBusMethodCallback& callback) OVERRIDE {
     MessageLoop::current()->PostTask(FROM_HERE,
                                      base::Bind(callback,
                                                 DBUS_METHOD_CALL_SUCCESS));
   }
 
   // FlimflamManagerClient override.
-  virtual void GetService(const base::DictionaryValue& properties,
-                          const ObjectPathCallback& callback) OVERRIDE {
+  virtual void GetService(
+      const base::DictionaryValue& properties,
+      const ObjectPathDBusMethodCallback& callback) OVERRIDE {
     MessageLoop::current()->PostTask(FROM_HERE,
                                      base::Bind(callback,
                                                 DBUS_METHOD_CALL_SUCCESS,
diff --git a/chromeos/dbus/flimflam_manager_client.h b/chromeos/dbus/flimflam_manager_client.h
index b767703..98cb9cf 100644
--- a/chromeos/dbus/flimflam_manager_client.h
+++ b/chromeos/dbus/flimflam_manager_client.h
@@ -27,8 +27,6 @@ namespace chromeos {
 class CHROMEOS_EXPORT FlimflamManagerClient {
  public:
   typedef FlimflamClientHelper::PropertyChangedHandler PropertyChangedHandler;
-  typedef FlimflamClientHelper::VoidCallback VoidCallback;
-  typedef FlimflamClientHelper::ObjectPathCallback ObjectPathCallback;
   typedef FlimflamClientHelper::DictionaryValueCallback DictionaryValueCallback;
 
   virtual ~FlimflamManagerClient();
@@ -61,32 +59,32 @@ class CHROMEOS_EXPORT FlimflamManagerClient {
   // |callback| is called after the method call succeeds.
   virtual void SetProperty(const std::string& name,
                            const base::Value& value,
-                           const VoidCallback& callback) = 0;
+                           const VoidDBusMethodCallback& callback) = 0;
 
   // Calls RequestScan method.
   // |callback| is called after the method call succeeds.
   virtual void RequestScan(const std::string& type,
-                           const VoidCallback& callback) = 0;
+                           const VoidDBusMethodCallback& callback) = 0;
 
   // Calls EnableTechnology method.
   // |callback| is called after the method call succeeds.
   virtual void EnableTechnology(const std::string& type,
-                                const VoidCallback& callback) = 0;
+                                const VoidDBusMethodCallback& callback) = 0;
 
   // Calls DisableTechnology method.
   // |callback| is called after the method call succeeds.
   virtual void DisableTechnology(const std::string& type,
-                                 const VoidCallback& callback) = 0;
+                                 const VoidDBusMethodCallback& callback) = 0;
 
   // Calls ConfigureService method.
   // |callback| is called after the method call succeeds.
   virtual void ConfigureService(const base::DictionaryValue& properties,
-                                const VoidCallback& callback) = 0;
+                                const VoidDBusMethodCallback& callback) = 0;
 
   // Calls GetService method.
   // |callback| is called after the method call succeeds.
   virtual void GetService(const base::DictionaryValue& properties,
-                          const ObjectPathCallback& callback) = 0;
+                          const ObjectPathDBusMethodCallback& callback) = 0;
 
  protected:
   // Create() should be used instead.
diff --git a/chromeos/dbus/flimflam_profile_client.cc b/chromeos/dbus/flimflam_profile_client.cc
index 05cc11a..b48f39e 100644
--- a/chromeos/dbus/flimflam_profile_client.cc
+++ b/chromeos/dbus/flimflam_profile_client.cc
@@ -36,7 +36,7 @@ class FlimflamProfileClientImpl : public FlimflamProfileClient {
                         const DictionaryValueCallback& callback) OVERRIDE;
   virtual void DeleteEntry(const dbus::ObjectPath& profile_path,
                            const std::string& entry_path,
-                           const VoidCallback& callback) OVERRIDE;
+                           const VoidDBusMethodCallback& callback) OVERRIDE;
 
  private:
   typedef std::map<std::string, FlimflamClientHelper*> HelperMap;
@@ -104,7 +104,7 @@ void FlimflamProfileClientImpl::GetEntry(
 void FlimflamProfileClientImpl::DeleteEntry(
     const dbus::ObjectPath& profile_path,
     const std::string& entry_path,
-    const VoidCallback& callback) {
+    const VoidDBusMethodCallback& callback) {
   dbus::MethodCall method_call(flimflam::kFlimflamProfileInterface,
                                flimflam::kDeleteEntryFunction);
   dbus::MessageWriter writer(&method_call);
@@ -152,7 +152,7 @@ class FlimflamProfileClientStubImpl : public FlimflamProfileClient {
   // FlimflamProfileClient override.
   virtual void DeleteEntry(const dbus::ObjectPath& profile_path,
                            const std::string& entry_path,
-                           const VoidCallback& callback) OVERRIDE {
+                           const VoidDBusMethodCallback& callback) OVERRIDE {
     MessageLoop::current()->PostTask(FROM_HERE,
                                      base::Bind(callback,
                                                 DBUS_METHOD_CALL_SUCCESS));
diff --git a/chromeos/dbus/flimflam_profile_client.h b/chromeos/dbus/flimflam_profile_client.h
index d226aa3..85f74a3 100644
--- a/chromeos/dbus/flimflam_profile_client.h
+++ b/chromeos/dbus/flimflam_profile_client.h
@@ -35,7 +35,6 @@ namespace chromeos {
 class CHROMEOS_EXPORT FlimflamProfileClient {
  public:
   typedef FlimflamClientHelper::PropertyChangedHandler PropertyChangedHandler;
-  typedef FlimflamClientHelper::VoidCallback VoidCallback;
   typedef FlimflamClientHelper::DictionaryValueCallback DictionaryValueCallback;
 
   virtual ~FlimflamProfileClient();
@@ -69,7 +68,7 @@ class CHROMEOS_EXPORT FlimflamProfileClient {
   // |callback| is called after the method call succeeds.
   virtual void DeleteEntry(const dbus::ObjectPath& profile_path,
                            const std::string& entry_path,
-                           const VoidCallback& callback) = 0;
+                           const VoidDBusMethodCallback& callback) = 0;
 
  protected:
   // Create() should be used instead.
diff --git a/chromeos/dbus/flimflam_service_client.cc b/chromeos/dbus/flimflam_service_client.cc
index eafc381..6360792 100644
--- a/chromeos/dbus/flimflam_service_client.cc
+++ b/chromeos/dbus/flimflam_service_client.cc
@@ -75,7 +75,7 @@ class FlimflamServiceClientImpl : public FlimflamServiceClient {
   virtual void SetProperty(const dbus::ObjectPath& service_path,
                            const std::string& name,
                            const base::Value& value,
-                           const VoidCallback& callback) OVERRIDE {
+                           const VoidDBusMethodCallback& callback) OVERRIDE {
     dbus::MethodCall method_call(flimflam::kFlimflamServiceInterface,
                                  flimflam::kSetPropertyFunction);
     dbus::MessageWriter writer(&method_call);
@@ -87,7 +87,7 @@ class FlimflamServiceClientImpl : public FlimflamServiceClient {
   // FlimflamServiceClient override.
   virtual void ClearProperty(const dbus::ObjectPath& service_path,
                              const std::string& name,
-                             const VoidCallback& callback) OVERRIDE {
+                             const VoidDBusMethodCallback& callback) OVERRIDE {
     dbus::MethodCall method_call(flimflam::kFlimflamServiceInterface,
                                  flimflam::kClearPropertyFunction);
     dbus::MessageWriter writer(&method_call);
@@ -107,7 +107,7 @@ class FlimflamServiceClientImpl : public FlimflamServiceClient {
 
   // FlimflamServiceClient override.
   virtual void Disconnect(const dbus::ObjectPath& service_path,
-                          const VoidCallback& callback) OVERRIDE {
+                          const VoidDBusMethodCallback& callback) OVERRIDE {
     dbus::MethodCall method_call(flimflam::kFlimflamServiceInterface,
                                  flimflam::kDisconnectFunction);
     GetHelper(service_path)->CallVoidMethod(&method_call, callback);
@@ -115,16 +115,17 @@ class FlimflamServiceClientImpl : public FlimflamServiceClient {
 
   // FlimflamServiceClient override.
   virtual void Remove(const dbus::ObjectPath& service_path,
-                      const VoidCallback& callback) OVERRIDE {
+                      const VoidDBusMethodCallback& callback) OVERRIDE {
     dbus::MethodCall method_call(flimflam::kFlimflamServiceInterface,
                                  flimflam::kRemoveServiceFunction);
     GetHelper(service_path)->CallVoidMethod(&method_call, callback);
   }
 
   // FlimflamServiceClient override.
-  virtual void ActivateCellularModem(const dbus::ObjectPath& service_path,
-                                     const std::string& carrier,
-                                     const VoidCallback& callback) OVERRIDE {
+  virtual void ActivateCellularModem(
+      const dbus::ObjectPath& service_path,
+      const std::string& carrier,
+      const VoidDBusMethodCallback& callback) OVERRIDE {
     dbus::MethodCall method_call(flimflam::kFlimflamServiceInterface,
                                  flimflam::kActivateCellularModemFunction);
     dbus::MessageWriter writer(&method_call);
@@ -198,14 +199,14 @@ class FlimflamServiceClientStubImpl : public FlimflamServiceClient {
   virtual void SetProperty(const dbus::ObjectPath& service_path,
                            const std::string& name,
                            const base::Value& value,
-                           const VoidCallback& callback) OVERRIDE {
+                           const VoidDBusMethodCallback& callback) OVERRIDE {
     PostSuccessVoidCallback(callback);
   }
 
   // FlimflamServiceClient override.
   virtual void ClearProperty(const dbus::ObjectPath& service_path,
                              const std::string& name,
-                             const VoidCallback& callback) OVERRIDE {
+                             const VoidDBusMethodCallback& callback) OVERRIDE {
     PostSuccessVoidCallback(callback);
   }
 
@@ -218,20 +219,21 @@ class FlimflamServiceClientStubImpl : public FlimflamServiceClient {
 
   // FlimflamServiceClient override.
   virtual void Disconnect(const dbus::ObjectPath& service_path,
-                          const VoidCallback& callback) OVERRIDE {
+                          const VoidDBusMethodCallback& callback) OVERRIDE {
     PostSuccessVoidCallback(callback);
   }
 
   // FlimflamServiceClient override.
   virtual void Remove(const dbus::ObjectPath& service_path,
-                      const VoidCallback& callback) OVERRIDE {
+                      const VoidDBusMethodCallback& callback) OVERRIDE {
     PostSuccessVoidCallback(callback);
   }
 
   // FlimflamServiceClient override.
-  virtual void ActivateCellularModem(const dbus::ObjectPath& service_path,
-                                     const std::string& carrier,
-                                     const VoidCallback& callback) OVERRIDE {
+  virtual void ActivateCellularModem(
+      const dbus::ObjectPath& service_path,
+      const std::string& carrier,
+      const VoidDBusMethodCallback& callback) OVERRIDE {
     PostSuccessVoidCallback(callback);
   }
 
@@ -249,7 +251,7 @@ class FlimflamServiceClientStubImpl : public FlimflamServiceClient {
   }
 
   // Posts a task to run a void callback with success status code.
-  void PostSuccessVoidCallback(const VoidCallback& callback) {
+  void PostSuccessVoidCallback(const VoidDBusMethodCallback& callback) {
     MessageLoop::current()->PostTask(FROM_HERE,
                                      base::Bind(callback,
                                                 DBUS_METHOD_CALL_SUCCESS));
diff --git a/chromeos/dbus/flimflam_service_client.h b/chromeos/dbus/flimflam_service_client.h
index 0e42767..d876b42 100644
--- a/chromeos/dbus/flimflam_service_client.h
+++ b/chromeos/dbus/flimflam_service_client.h
@@ -36,7 +36,6 @@ namespace chromeos {
 class CHROMEOS_EXPORT FlimflamServiceClient {
  public:
   typedef FlimflamClientHelper::PropertyChangedHandler PropertyChangedHandler;
-  typedef FlimflamClientHelper::VoidCallback VoidCallback;
   typedef FlimflamClientHelper::DictionaryValueCallback DictionaryValueCallback;
   typedef FlimflamClientHelper::ErrorCallback ErrorCallback;
 
@@ -66,13 +65,13 @@ class CHROMEOS_EXPORT FlimflamServiceClient {
   virtual void SetProperty(const dbus::ObjectPath& service_path,
                            const std::string& name,
                            const base::Value& value,
-                           const VoidCallback& callback) = 0;
+                           const VoidDBusMethodCallback& callback) = 0;
 
   // Calls ClearProperty method.
   // |callback| is called after the method call succeeds.
   virtual void ClearProperty(const dbus::ObjectPath& service_path,
                              const std::string& name,
-                             const VoidCallback& callback) = 0;
+                             const VoidDBusMethodCallback& callback) = 0;
 
   // Calls Connect method.
   // |callback| is called after the method call succeeds.
@@ -83,18 +82,19 @@ class CHROMEOS_EXPORT FlimflamServiceClient {
   // Calls Disconnect method.
   // |callback| is called after the method call succeeds.
   virtual void Disconnect(const dbus::ObjectPath& service_path,
-                          const VoidCallback& callback) = 0;
+                          const VoidDBusMethodCallback& callback) = 0;
 
   // Calls Remove method.
   // |callback| is called after the method call succeeds.
   virtual void Remove(const dbus::ObjectPath& service_path,
-                      const VoidCallback& callback) = 0;
+                      const VoidDBusMethodCallback& callback) = 0;
 
   // Calls ActivateCellularModem method.
   // |callback| is called after the method call succeeds.
-  virtual void ActivateCellularModem(const dbus::ObjectPath& service_path,
-                                     const std::string& carrier,
-                                     const VoidCallback& callback) = 0;
+  virtual void ActivateCellularModem(
+      const dbus::ObjectPath& service_path,
+      const std::string& carrier,
+      const VoidDBusMethodCallback& callback) = 0;
 
   // DEPRECATED DO NOT USE: Calls ActivateCellularModem method and blocks until
   // the method call finishes.
diff --git a/chromeos/dbus/mock_cryptohome_client.cc b/chromeos/dbus/mock_cryptohome_client.cc
index 56ac607..3ceeb3d 100644
--- a/chromeos/dbus/mock_cryptohome_client.cc
+++ b/chromeos/dbus/mock_cryptohome_client.cc
@@ -15,7 +15,7 @@ namespace chromeos {
 namespace {
 
 // Runs callback with true.
-void RunCallbackWithTrue(const CryptohomeClient::BoolMethodCallback& callback) {
+void RunCallbackWithTrue(const BoolDBusMethodCallback& callback) {
   MessageLoop::current()->PostTask(
       FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS, true));
 }
diff --git a/chromeos/dbus/mock_cryptohome_client.h b/chromeos/dbus/mock_cryptohome_client.h
index e7fb3c3..e36f887 100644
--- a/chromeos/dbus/mock_cryptohome_client.h
+++ b/chromeos/dbus/mock_cryptohome_client.h
@@ -20,7 +20,7 @@ class MockCryptohomeClient : public CryptohomeClient {
   MOCK_METHOD1(SetAsyncCallStatusHandler,
                void(const AsyncCallStatusHandler& handler));
   MOCK_METHOD0(ResetAsyncCallStatusHandler, void());
-  MOCK_METHOD1(IsMounted, void(const BoolMethodCallback& callback));
+  MOCK_METHOD1(IsMounted, void(const BoolDBusMethodCallback& callback));
   MOCK_METHOD1(Unmount, bool(bool* success));
   MOCK_METHOD3(AsyncCheckKey,
                void(const std::string& username,
@@ -40,16 +40,17 @@ class MockCryptohomeClient : public CryptohomeClient {
                                 const AsyncMethodCallback& callback));
   MOCK_METHOD1(AsyncMountGuest,
                void(const AsyncMethodCallback& callback));
-  MOCK_METHOD1(TpmIsReady, void(const BoolMethodCallback& callback));
-  MOCK_METHOD1(TpmIsEnabled, void(const BoolMethodCallback& callback));
+  MOCK_METHOD1(TpmIsReady, void(const BoolDBusMethodCallback& callback));
+  MOCK_METHOD1(TpmIsEnabled, void(const BoolDBusMethodCallback& callback));
   MOCK_METHOD1(CallTpmIsEnabledAndBlock, bool(bool* enabled));
-  MOCK_METHOD1(TpmGetPassword, void(const StringMethodCallback& callback));
+  MOCK_METHOD1(TpmGetPassword, void(const StringDBusMethodCallback& callback));
   MOCK_METHOD1(TpmIsOwned, bool(bool* owned));
   MOCK_METHOD1(TpmIsBeingOwned, bool(bool* owning));
   MOCK_METHOD1(TpmCanAttemptOwnership,
-               void(const VoidMethodCallback& callback));
+               void(const VoidDBusMethodCallback& callback));
   MOCK_METHOD0(TpmClearStoredPassword, bool());
-  MOCK_METHOD1(Pkcs11IsTpmTokenReady, void(const BoolMethodCallback& callback));
+  MOCK_METHOD1(Pkcs11IsTpmTokenReady,
+               void(const BoolDBusMethodCallback& callback));
   MOCK_METHOD1(Pkcs11GetTpmTokenInfo,
                void(const Pkcs11GetTpmTokenInfoCallback& callback));
   MOCK_METHOD3(InstallAttributesGet,
diff --git a/chromeos/dbus/mock_flimflam_device_client.h b/chromeos/dbus/mock_flimflam_device_client.h
index c68ebd20..6fb2170 100644
--- a/chromeos/dbus/mock_flimflam_device_client.h
+++ b/chromeos/dbus/mock_flimflam_device_client.h
@@ -27,17 +27,17 @@ class MockFlimflamDeviceClient : public FlimflamDeviceClient {
   MOCK_METHOD1(CallGetPropertiesAndBlock,
                base::DictionaryValue*(const dbus::ObjectPath& device_path));
   MOCK_METHOD2(ProposeScan, void(const dbus::ObjectPath& device_path,
-                                 const VoidCallback& callback));
+                                 const VoidDBusMethodCallback& callback));
   MOCK_METHOD4(SetProperty, void(const dbus::ObjectPath& device_path,
                                  const std::string& name,
                                  const base::Value& value,
-                                 const VoidCallback& callback));
+                                 const VoidDBusMethodCallback& callback));
   MOCK_METHOD3(ClearProperty, void(const dbus::ObjectPath& device_path,
                                    const std::string& name,
-                                   const VoidCallback& callback));
+                                   const VoidDBusMethodCallback& callback));
   MOCK_METHOD3(AddIPConfig, void(const dbus::ObjectPath& device_path,
                                  const std::string& method,
-                                 const ObjectPathCallback& callback));
+                                 const ObjectPathDBusMethodCallback& callback));
   MOCK_METHOD2(CallAddIPConfigAndBlock,
                dbus::ObjectPath(const dbus::ObjectPath& device_path,
                                 const std::string& method));
diff --git a/chromeos/dbus/mock_flimflam_ipconfig_client.h b/chromeos/dbus/mock_flimflam_ipconfig_client.h
index b0826d7..bf0e014 100644
--- a/chromeos/dbus/mock_flimflam_ipconfig_client.h
+++ b/chromeos/dbus/mock_flimflam_ipconfig_client.h
@@ -29,12 +29,12 @@ class MockFlimflamIPConfigClient : public FlimflamIPConfigClient {
   MOCK_METHOD4(SetProperty, void(const dbus::ObjectPath& ipconfig_path,
                                  const std::string& name,
                                  const base::Value& value,
-                                 const VoidCallback& callback));
+                                 const VoidDBusMethodCallback& callback));
   MOCK_METHOD3(ClearProperty, void(const dbus::ObjectPath& ipconfig_path,
                                    const std::string& name,
-                                   const VoidCallback& callback));
+                                   const VoidDBusMethodCallback& callback));
   MOCK_METHOD2(Remove, void(const dbus::ObjectPath& ipconfig_path,
-                            const VoidCallback& callback));
+                            const VoidDBusMethodCallback& callback));
   MOCK_METHOD1(CallRemoveAndBlock, bool(const dbus::ObjectPath& ipconfig_path));
 };
 
diff --git a/chromeos/dbus/mock_flimflam_manager_client.h b/chromeos/dbus/mock_flimflam_manager_client.h
index f412ff8..d76a7b7 100644
--- a/chromeos/dbus/mock_flimflam_manager_client.h
+++ b/chromeos/dbus/mock_flimflam_manager_client.h
@@ -23,17 +23,17 @@ class MockFlimflamManagerClient : public FlimflamManagerClient {
   MOCK_METHOD0(CallGetPropertiesAndBlock, base::DictionaryValue*());
   MOCK_METHOD3(SetProperty, void(const std::string& name,
                                  const base::Value& value,
-                                 const VoidCallback& callback));
+                                 const VoidDBusMethodCallback& callback));
   MOCK_METHOD2(RequestScan, void(const std::string& type,
-                                 const VoidCallback& callback));
+                                 const VoidDBusMethodCallback& callback));
   MOCK_METHOD2(EnableTechnology, void(const std::string& type,
-                                      const VoidCallback& callback));
+                                      const VoidDBusMethodCallback& callback));
   MOCK_METHOD2(DisableTechnology, void(const std::string& type,
-                                       const VoidCallback& callback));
+                                       const VoidDBusMethodCallback& callback));
   MOCK_METHOD2(ConfigureService, void(const base::DictionaryValue& properties,
-                                      const VoidCallback& callback));
+                                      const VoidDBusMethodCallback& callback));
   MOCK_METHOD2(GetService, void(const base::DictionaryValue& properties,
-                                const ObjectPathCallback& callback));
+                                const ObjectPathDBusMethodCallback& callback));
 };
 
 }  // namespace chromeos
diff --git a/chromeos/dbus/mock_flimflam_profile_client.h b/chromeos/dbus/mock_flimflam_profile_client.h
index 88e67f5..34f9b09 100644
--- a/chromeos/dbus/mock_flimflam_profile_client.h
+++ b/chromeos/dbus/mock_flimflam_profile_client.h
@@ -29,7 +29,7 @@ class MockFlimflamProfileClient : public FlimflamProfileClient {
                               const DictionaryValueCallback& callback));
   MOCK_METHOD3(DeleteEntry, void(const dbus::ObjectPath& profile_path,
                                  const std::string& entry_path,
-                                 const VoidCallback& callback));
+                                 const VoidDBusMethodCallback& callback));
 };
 
 }  // namespace chromeos
diff --git a/chromeos/dbus/mock_flimflam_service_client.h b/chromeos/dbus/mock_flimflam_service_client.h
index 42a9417..8bc0a6e 100644
--- a/chromeos/dbus/mock_flimflam_service_client.h
+++ b/chromeos/dbus/mock_flimflam_service_client.h
@@ -27,20 +27,21 @@ class MockFlimflamServiceClient : public FlimflamServiceClient {
   MOCK_METHOD4(SetProperty, void(const dbus::ObjectPath& service_path,
                                  const std::string& name,
                                  const base::Value& value,
-                                 const VoidCallback& callback));
+                                 const VoidDBusMethodCallback& callback));
   MOCK_METHOD3(ClearProperty, void(const dbus::ObjectPath& service_path,
                                    const std::string& name,
-                                   const VoidCallback& callback));
+                                   const VoidDBusMethodCallback& callback));
   MOCK_METHOD3(Connect, void(const dbus::ObjectPath& service_path,
                              const base::Closure& callback,
                              const ErrorCallback& error_callback));
   MOCK_METHOD2(Disconnect, void(const dbus::ObjectPath& service_path,
-                                const VoidCallback& callback));
+                                const VoidDBusMethodCallback& callback));
   MOCK_METHOD2(Remove, void(const dbus::ObjectPath& service_path,
-                            const VoidCallback& callback));
-  MOCK_METHOD3(ActivateCellularModem, void(const dbus::ObjectPath& service_path,
-                                           const std::string& carrier,
-                                           const VoidCallback& callback));
+                            const VoidDBusMethodCallback& callback));
+  MOCK_METHOD3(ActivateCellularModem,
+               void(const dbus::ObjectPath& service_path,
+                    const std::string& carrier,
+                    const VoidDBusMethodCallback& callback));
   MOCK_METHOD2(CallActivateCellularModemAndBlock,
                bool(const dbus::ObjectPath& service_path,
                     const std::string& carrier));