Keep track of the list of currently mounted volumes in C++-side VolumeManager.

chrome/browser/chromeos/extensions/file_manager/file_browser_private_apitest.cc

Index: chrome/browser/chromeos/extensions/file_manager/file_browser_private_apitest.cc
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_apitest.cc b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_apitest.cc
index 6f27fb35b987b823e97c10f09832229d81d15cf4..b3082b96271b110719281a1c110d9a92b778bf2a 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_apitest.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_apitest.cc
@@ -128,10 +128,13 @@ class FileBrowserPrivateApiTest : public ExtensionApiTest {
         disk_mount_manager_mock_);
     disk_mount_manager_mock_->SetupDefaultReplies();
 
-    // OVERRIDE FindDiskBySourcePath mock function.
-    ON_CALL(*disk_mount_manager_mock_, FindDiskBySourcePath(_)).
-        WillByDefault(Invoke(
-            this, &FileBrowserPrivateApiTest::FindVolumeBySourcePath));
+    // OVERRIDE mock functions.
+    ON_CALL(*disk_mount_manager_mock_, FindDiskBySourcePath(_)).WillByDefault(
+        Invoke(this, &FileBrowserPrivateApiTest::FindVolumeBySourcePath));
+    EXPECT_CALL(*disk_mount_manager_mock_, disks())
+        .WillRepeatedly(ReturnRef(volumes_));
+    EXPECT_CALL(*disk_mount_manager_mock_, mount_points())
+        .WillRepeatedly(ReturnRef(mount_points_));
   }
 
   // ExtensionApiTest override
@@ -248,12 +251,6 @@ IN_PROC_BROWSER_TEST_F(FileBrowserPrivateApiTest, Mount) {
                       "archive_mount_path").AsUTF8Unsafe(),
                   chromeos::UNMOUNT_OPTIONS_NONE, _)).Times(1);
 
-  EXPECT_CALL(*disk_mount_manager_mock_, disks())
-      .WillRepeatedly(ReturnRef(volumes_));
-
-  EXPECT_CALL(*disk_mount_manager_mock_, mount_points())
-      .WillRepeatedly(ReturnRef(mount_points_));
-
   ASSERT_TRUE(RunComponentExtensionTest("file_browser/mount_test"))
       << message_;
 }