Small refactoring in DiskMountManager (event reporting; format method).

chromeos/dbus/mock_cros_disks_client.h

Index: chromeos/dbus/mock_cros_disks_client.h
diff --git a/chromeos/dbus/mock_cros_disks_client.h b/chromeos/dbus/mock_cros_disks_client.h
index 9b594001d282bdce57dc51e12328dfeb930b2900..c239fc89b83b12d1bce4f6413b63569207fa5955 100644
--- a/chromeos/dbus/mock_cros_disks_client.h
+++ b/chromeos/dbus/mock_cros_disks_client.h
@@ -37,8 +37,28 @@ class MockCrosDisksClient : public CrosDisksClient {
   MOCK_METHOD3(GetDeviceProperties, void(const std::string&,
                                          const GetDevicePropertiesCallback&,
                                          const ErrorCallback&));
+  // Warning: if this method is mocked, SendMountEvent and
+  // SendMountCompletedEvent may not work.
   MOCK_METHOD2(SetUpConnections, void(const MountEventHandler&,
                                       const MountCompletedHandler&));
+
+  // Used to simulate signals sent by cros disks layer.
+  // Invokes handlers set in |SetUpConnections|.
+  bool SendMountEvent(MountEventType event, const std::string& path);
+  bool SendMountCompletedEvent(MountError error_code,
+                               const std::string& source_path,
+                               MountType mount_type,
+                               const std::string& mount_path);
+
+ private:
+  // Default implementation of SetupConnections.
+  // Sets internal MounteEvent and MountCompleted handlers.
+  void SetUpConnectionsInternal(
+      const MountEventHandler& mount_event_handler,
+      const MountCompletedHandler& mount_completed_handler);
+
+  MountEventHandler mount_event_handler_;
+  MountCompletedHandler mount_completed_handler_;
 };
 
 }  // namespace chromeos