| Index: chrome/browser/media_galleries/media_scan_manager_unittest.cc
|
| diff --git a/chrome/browser/media_galleries/media_scan_manager_unittest.cc b/chrome/browser/media_galleries/media_scan_manager_unittest.cc
|
| index 6d23369002af59360af85dbb02899f0f1f3f413b..cdd59f70d8df1de88725ea146e88b00090db6f28 100644
|
| --- a/chrome/browser/media_galleries/media_scan_manager_unittest.cc
|
| +++ b/chrome/browser/media_galleries/media_scan_manager_unittest.cc
|
| @@ -396,7 +396,7 @@ TEST_F(MediaScanManagerTest, UpdateExistingScanResults) {
|
| base::RunLoop().RunUntilIdle();
|
| EXPECT_EQ(1, FindFolderDestroyCount());
|
| EXPECT_EQ(galleries_before + 1, gallery_prefs()->known_galleries().size());
|
| - CheckFileCounts(granted_scan, 0, 2, 0);
|
| + CheckFileCounts(granted_scan, 0, 0, 0);
|
|
|
| MediaGalleryPrefId id =
|
| AddGallery("uscan", MediaGalleryPrefInfo::kScanResult, 1, 1, 1);
|
| @@ -449,14 +449,14 @@ TEST_F(MediaScanManagerTest, UpdateExistingCounts) {
|
| base::FilePath path = MakeTestFolder("auto/dir1");
|
| found_folders[path] = file_counts;
|
|
|
| - file_counts.audio_count = 5;
|
| - path = MakeTestFolder("user/dir2");
|
| - found_folders[path] = file_counts;
|
| -
|
| file_counts.audio_count = 6;
|
| path = MakeTestFolder("scan");
|
| found_folders[path] = file_counts;
|
|
|
| + file_counts.audio_count = 5;
|
| + path = MakeTestFolder("user/dir2");
|
| + found_folders[path] = file_counts;
|
| +
|
| SetFindFoldersResults(true, found_folders);
|
|
|
| file_counts.audio_count = 0;
|
| @@ -469,4 +469,16 @@ TEST_F(MediaScanManagerTest, UpdateExistingCounts) {
|
| CheckFileCounts(auto_id, 4, 0, 0);
|
| CheckFileCounts(user_id, 5, 0, 0);
|
| CheckFileCounts(scan_id, 6, 0, 0);
|
| +
|
| + EXPECT_EQ(1U, found_folders.erase(path));
|
| + SetFindFoldersResults(true, found_folders);
|
| + SetExpectedScanResults(0 /*gallery_count*/, file_counts);
|
| + StartScan();
|
| +
|
| + base::RunLoop().RunUntilIdle();
|
| + EXPECT_EQ(2, FindFolderDestroyCount());
|
| + EXPECT_EQ(galleries_before + 3, gallery_prefs()->known_galleries().size());
|
| + CheckFileCounts(auto_id, 4, 0, 0);
|
| + CheckFileCounts(user_id, 0, 0, 0);
|
| + CheckFileCounts(scan_id, 6, 0, 0);
|
| }
|
|
|