Add callback to DiskMountManager::UnmountPath

chromeos/disks/disk_mount_manager_unittest.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 "base/bind.h"
 #include "base/message_loop.h"
 #include "chromeos/dbus/mock_cros_disks_client.h"
 #include "chromeos/dbus/mock_dbus_thread_manager.h"
 #include "chromeos/disks/disk_mount_manager.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 313 matching lines @@
   // Cros disks will respond asynchronoulsy, so let's drain the message loop.
   message_loop_.RunUntilIdle();
 
   // The device mount should be gone.
   EXPECT_FALSE(HasMountPoint("/device/mount_path"));
 }
 
 // Tests the case where there are two format requests for the same device.
 TEST_F(DiskMountManagerTest, Format_ConcurrentFormatCalls) {
   // Set up cros disks client mocks.
-  // Only the first format request should be processed (for the other one there
-  // should be an error before device unmount is attempted).
+  // Only the first format request should be processed (the second unmount
+  // request fails because the device is already unmounted at that point).
   // CrosDisksClient will report that the format process for the first request
   // is successfully started.
   EXPECT_CALL(*mock_cros_disks_client_,
               Unmount("/device/mount_path", chromeos::UNMOUNT_OPTIONS_NONE,
                       _, _))
-      .WillOnce(MockUnmountPath(true));
+      .WillOnce(MockUnmountPath(true))
+      .WillOnce(MockUnmountPath(false));
 
   EXPECT_CALL(*mock_cros_disks_client_,
               FormatDevice("/device/source_path", "vfat", _, _))
       .WillOnce(MockFormatDevice(true));
 
   // Set up expectations for observer mock.
   // The observer should get two FORMAT_STARTED events, one for each format
   // request, but with different error codes (the formatting will be started
   // only for the first request).
-  // There should alos be one UNMOUNTING event, since the device should get
-  // unmounted for the first request.
+  // There should be only one UNMOUNTING event. The result of the second one
+  // should not be reported as the mount point will go away after the first
+  // request.
   //
   // Note that in this test the format completion signal will not be simulated,
   // so the observer should not get FORMAT_COMPLETED signal.
   {
     InSequence s;
 
-    EXPECT_CALL(observer_, OnFormatEvent(DiskMountManager::FORMAT_STARTED,
-                                         chromeos::FORMAT_ERROR_UNKNOWN,
-                                         "/device/source_path"))
-        .Times(1);
-
     EXPECT_CALL(observer_,
         OnMountEvent(DiskMountManager::UNMOUNTING,
                      chromeos::MOUNT_ERROR_NONE,
                      Field(&DiskMountManager::MountPointInfo::mount_path,
                            "/device/mount_path")))
         .Times(1);
 
     EXPECT_CALL(observer_, OnFormatEvent(DiskMountManager::FORMAT_STARTED,
+                                         chromeos::FORMAT_ERROR_UNKNOWN,
+                                         "/device/source_path"))
+        .Times(1);
+
+    EXPECT_CALL(observer_, OnFormatEvent(DiskMountManager::FORMAT_STARTED,
                                          chromeos::FORMAT_ERROR_NONE,
                                          "/device/source_path"))
         .Times(1);
   }
 
   // Start the test.
   DiskMountManager::GetInstance()->FormatMountedDevice("/device/mount_path");
   DiskMountManager::GetInstance()->FormatMountedDevice("/device/mount_path");
 
   // Cros disks will respond asynchronoulsy, so let's drain the message loop.
@@ skipping 234 matching lines @@
   // Wait for Unmount and FormatDevice calls to end.
   message_loop_.RunUntilIdle();
 
   // Simulate cros_disks reporting success.
   mock_cros_disks_client_->SendMountEvent(
       chromeos::CROS_DISKS_FORMATTING_FINISHED, "/device/source_path");
 }
 
 }  // namespace