chromeos: Convert D-Bus client classes' callback arguments to const reference

chromeos/dbus/cros_disks_client.cc

 // Copyright (c) 2012 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 "chromeos/dbus/cros_disks_client.h"
 
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
@@ skipping 96 matching lines @@
   explicit CrosDisksClientImpl(dbus::Bus* bus)
       : proxy_(bus->GetObjectProxy(
           cros_disks::kCrosDisksServiceName,
           dbus::ObjectPath(cros_disks::kCrosDisksServicePath))),
         weak_ptr_factory_(this) {
   }
 
   // CrosDisksClient override.
   virtual void Mount(const std::string& source_path,
                      MountType type,
-                     MountCallback callback,
-                     ErrorCallback error_callback) OVERRIDE {
+                     const MountCallback& callback,
+                     const ErrorCallback& error_callback) OVERRIDE {
     dbus::MethodCall method_call(cros_disks::kCrosDisksInterface,
                                  cros_disks::kMount);
     dbus::MessageWriter writer(&method_call);
     writer.AppendString(source_path);
     writer.AppendString("");  // auto detect filesystem.
     std::vector<std::string> mount_options(kDefaultMountOptions,
                                            kDefaultMountOptions +
                                            arraysize(kDefaultMountOptions));
     writer.AppendArrayOfStrings(mount_options);
     proxy_->CallMethod(&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
                        base::Bind(&CrosDisksClientImpl::OnMount,
                                   weak_ptr_factory_.GetWeakPtr(),
                                   callback,
                                   error_callback));
   }
 
   // CrosDisksClient override.
   virtual void Unmount(const std::string& device_path,
-                       UnmountCallback callback,
-                       ErrorCallback error_callback) OVERRIDE {
+                       const UnmountCallback& callback,
+                       const ErrorCallback& error_callback) OVERRIDE {
     dbus::MethodCall method_call(cros_disks::kCrosDisksInterface,
                                  cros_disks::kUnmount);
     dbus::MessageWriter writer(&method_call);
     writer.AppendString(device_path);
     std::vector<std::string> unmount_options(kDefaultUnmountOptions,
                                              kDefaultUnmountOptions +
                                              arraysize(kDefaultUnmountOptions));
     writer.AppendArrayOfStrings(unmount_options);
     proxy_->CallMethod(&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
                        base::Bind(&CrosDisksClientImpl::OnUnmount,
                                   weak_ptr_factory_.GetWeakPtr(),
                                   device_path,
                                   callback,
                                   error_callback));
   }
 
   // CrosDisksClient override.
   virtual void EnumerateAutoMountableDevices(
-      EnumerateAutoMountableDevicesCallback callback,
-      ErrorCallback error_callback) OVERRIDE {
+      const EnumerateAutoMountableDevicesCallback& callback,
+      const ErrorCallback& error_callback) OVERRIDE {
     dbus::MethodCall method_call(cros_disks::kCrosDisksInterface,
                                  cros_disks::kEnumerateAutoMountableDevices);
     proxy_->CallMethod(
         &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(&CrosDisksClientImpl::OnEnumerateAutoMountableDevices,
                    weak_ptr_factory_.GetWeakPtr(),
                    callback,
                    error_callback));
   }
 
   // CrosDisksClient override.
   virtual void FormatDevice(const std::string& device_path,
                             const std::string& filesystem,
-                            FormatDeviceCallback callback,
-                            ErrorCallback error_callback) OVERRIDE {
+                            const FormatDeviceCallback& callback,
+                            const ErrorCallback& error_callback) OVERRIDE {
     dbus::MethodCall method_call(cros_disks::kCrosDisksInterface,
                                  cros_disks::kFormatDevice);
     dbus::MessageWriter writer(&method_call);
     writer.AppendString(device_path);
     writer.AppendString(filesystem);
     proxy_->CallMethod(&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
                        base::Bind(&CrosDisksClientImpl::OnFormatDevice,
                                   weak_ptr_factory_.GetWeakPtr(),
                                   device_path,
                                   callback,
                                   error_callback));
   }
 
   // CrosDisksClient override.
-  virtual void GetDeviceProperties(const std::string& device_path,
-                                   GetDevicePropertiesCallback callback,
-                                   ErrorCallback error_callback) OVERRIDE {
+  virtual void GetDeviceProperties(
+      const std::string& device_path,
+      const GetDevicePropertiesCallback& callback,
+      const ErrorCallback& error_callback) OVERRIDE {
     dbus::MethodCall method_call(cros_disks::kCrosDisksInterface,
                                  cros_disks::kGetDeviceProperties);
     dbus::MessageWriter writer(&method_call);
     writer.AppendString(device_path);
     proxy_->CallMethod(&method_call,
                        dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
                        base::Bind(&CrosDisksClientImpl::OnGetDeviceProperties,
                                   weak_ptr_factory_.GetWeakPtr(),
                                   device_path,
                                   callback,
                                   error_callback));
   }
 
   // CrosDisksClient override.
   virtual void SetUpConnections(
-      MountEventHandler mount_event_handler,
-      MountCompletedHandler mount_completed_handler) OVERRIDE {
+      const MountEventHandler& mount_event_handler,
+      const MountCompletedHandler& mount_completed_handler) OVERRIDE {
     static const SignalEventTuple kSignalEventTuples[] = {
       { cros_disks::kDeviceAdded, DEVICE_ADDED },
       { cros_disks::kDeviceScanned, DEVICE_SCANNED },
       { cros_disks::kDeviceRemoved, DEVICE_REMOVED },
       { cros_disks::kDiskAdded, DISK_ADDED },
       { cros_disks::kDiskChanged, DISK_CHANGED },
       { cros_disks::kDiskRemoved, DISK_REMOVED },
       { cros_disks::kFormattingFinished, FORMATTING_FINISHED },
     };
     const size_t kNumSignalEventTuples = arraysize(kSignalEventTuples);
@@ skipping 21 matching lines @@
 
  private:
   // A struct to contain a pair of signal name and mount event type.
   // Used by SetUpConnections.
   struct SignalEventTuple {
     const char *signal_name;
     MountEventType event_type;
   };
 
   // Handles the result of Mount and calls |callback| or |error_callback|.
-  void OnMount(MountCallback callback,
-               ErrorCallback error_callback,
+  void OnMount(const MountCallback& callback,
+               const ErrorCallback& error_callback,
                dbus::Response* response) {
     if (!response) {
       error_callback.Run();
       return;
     }
     callback.Run();
   }
 
   // Handles the result of Unount and calls |callback| or |error_callback|.
   void OnUnmount(const std::string& device_path,
-                 UnmountCallback callback,
-                 ErrorCallback error_callback,
+                 const UnmountCallback& callback,
+                 const ErrorCallback& error_callback,
                  dbus::Response* response) {
     if (!response) {
       error_callback.Run();
       return;
     }
     callback.Run(device_path);
   }
 
   // Handles the result of EnumerateAutoMountableDevices and calls |callback| or
   // |error_callback|.
   void OnEnumerateAutoMountableDevices(
-      EnumerateAutoMountableDevicesCallback callback,
-      ErrorCallback error_callback,
+      const EnumerateAutoMountableDevicesCallback& callback,
+      const ErrorCallback& error_callback,
       dbus::Response* response) {
     if (!response) {
       error_callback.Run();
       return;
     }
     dbus::MessageReader reader(response);
     std::vector<std::string> device_paths;
     if (!reader.PopArrayOfStrings(&device_paths)) {
       LOG(ERROR) << "Invalid response: " << response->ToString();
       error_callback.Run();
       return;
     }
     callback.Run(device_paths);
   }
 
   // Handles the result of FormatDevice and calls |callback| or
   // |error_callback|.
   void OnFormatDevice(const std::string& device_path,
-                      FormatDeviceCallback callback,
-                      ErrorCallback error_callback,
+                      const FormatDeviceCallback& callback,
+                      const ErrorCallback& error_callback,
                       dbus::Response* response) {
     if (!response) {
       error_callback.Run();
       return;
     }
     dbus::MessageReader reader(response);
     bool success = false;
     if (!reader.PopBool(&success)) {
       LOG(ERROR) << "Invalid response: " << response->ToString();
       error_callback.Run();
       return;
     }
     callback.Run(device_path, success);
   }
 
   // Handles the result of GetDeviceProperties and calls |callback| or
   // |error_callback|.
   void OnGetDeviceProperties(const std::string& device_path,
-                             GetDevicePropertiesCallback callback,
-                             ErrorCallback error_callback,
+                             const GetDevicePropertiesCallback& callback,
+                             const ErrorCallback& error_callback,
                              dbus::Response* response) {
     if (!response) {
       error_callback.Run();
       return;
     }
     DiskInfo disk(device_path, response);
     callback.Run(disk);
   }
 
   // Handles mount event signals and calls |handler|.
@@ skipping 42 matching lines @@
 };
 
 // A stub implementaion of CrosDisksClient.
 class CrosDisksClientStubImpl : public CrosDisksClient {
  public:
   CrosDisksClientStubImpl() {}
   virtual ~CrosDisksClientStubImpl() {}
 
   virtual void Mount(const std::string& source_path,
                      MountType type,
-                     MountCallback callback,
-                     ErrorCallback error_callback) OVERRIDE {}
+                     const MountCallback& callback,
+                     const ErrorCallback& error_callback) OVERRIDE {}
   virtual void Unmount(const std::string& device_path,
-                       UnmountCallback callback,
-                       ErrorCallback error_callback) OVERRIDE {}
+                       const UnmountCallback& callback,
+                       const ErrorCallback& error_callback) OVERRIDE {}
   virtual void EnumerateAutoMountableDevices(
-      EnumerateAutoMountableDevicesCallback callback,
-      ErrorCallback error_callback) OVERRIDE {}
+      const EnumerateAutoMountableDevicesCallback& callback,
+      const ErrorCallback& error_callback) OVERRIDE {}
   virtual void FormatDevice(const std::string& device_path,
                             const std::string& filesystem,
-                            FormatDeviceCallback callback,
-                            ErrorCallback error_callback) OVERRIDE {}
-  virtual void GetDeviceProperties(const std::string& device_path,
-                                   GetDevicePropertiesCallback callback,
-                                   ErrorCallback error_callback) OVERRIDE {}
+                            const FormatDeviceCallback& callback,
+                            const ErrorCallback& error_callback) OVERRIDE {}
+  virtual void GetDeviceProperties(
+      const std::string& device_path,
+      const GetDevicePropertiesCallback& callback,
+      const ErrorCallback& error_callback) OVERRIDE {}
   virtual void SetUpConnections(
-      MountEventHandler mount_event_handler,
-      MountCompletedHandler mount_completed_handler) OVERRIDE {}
+      const MountEventHandler& mount_event_handler,
+      const MountCompletedHandler& mount_completed_handler) OVERRIDE {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CrosDisksClientStubImpl);
 };
 
 } // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // DiskInfo
 
@@ skipping 151 matching lines @@
 // static
 CrosDisksClient* CrosDisksClient::Create(DBusClientImplementationType type,
                                          dbus::Bus* bus) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)
     return new CrosDisksClientImpl(bus);
   DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
   return new CrosDisksClientStubImpl();
 }
 
 }  // namespace chromeos