Have FindContainerScanResults() find broader media container directories

chrome/browser/media_galleries/media_scan_manager_unittest.cc

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 5ab0c4ef241fc0186eedb29279d0bcbf7753b638..9ca48b9032c579fc26c3368fd085e8fb9ae690f6 100644
--- a/chrome/browser/media_galleries/media_scan_manager_unittest.cc
+++ b/chrome/browser/media_galleries/media_scan_manager_unittest.cc
@@ -230,7 +230,7 @@ class MediaScanManagerTest : public MediaScanManagerObserver,
     EXPECT_EQ(video_count, pref_info->second.video_count);
   }
 
-  // MediaScanMangerObserver implementation.
+  // MediaScanManagerObserver implementation.
   virtual void OnScanFinished(
       const std::string& extension_id,
       int gallery_count,
@@ -242,6 +242,15 @@ class MediaScanManagerTest : public MediaScanManagerObserver,
     EXPECT_EQ(expected_file_counts_.video_count, file_counts.video_count);
   }
 
+ protected:
+  // So derived tests can access ...::FindContainerScanResults().
+  MediaFolderFinder::MediaFolderFinderResults FindContainerScanResults(
+      const MediaFolderFinder::MediaFolderFinderResults& found_folders,
+      const std::vector<base::FilePath>& sensitive_locations) {
+    return MediaScanManager::FindContainerScanResults(found_folders,
+      sensitive_locations);
+  }
+
  private:
   void OnFindFoldersStarted(
       MediaFolderFinder::MediaFolderFinderResultsCallback callback) {
@@ -306,6 +315,92 @@ TEST_F(MediaScanManagerTest, SingleResult) {
   EXPECT_EQ(galleries_before + 1, gallery_count());
 }
 
+TEST_F(MediaScanManagerTest, MergeRedundant) {

[vandebo (ex-Chrome), 2014/05/27 19:07:16]

This is a fine test, but doesn't test the new functionality - only one level of
parenting is done.

The test case that I'd like to see, which I suspect still doesn't work is:

A/B/files
A/C/files
A/D/files
A/E/files
A/F/files

B-F only get a count of because they actually only have one child, but I would
like A to be added as a container (because it really is).

[Kevin Bailey, 2014/05/27 21:04:36]

Added test that duplicates this. Passes.

Did you mean this?

A/B1/B2/files
A/C1/C2/files
A/D1/D2/files

That is easy for humans to spot, but harder for computers to (and reject false
ones.)

[vandebo (ex-Chrome), 2014/05/28 00:36:59]

Oops, yes, I meant what you typed. This is the motivation for this change...
Library/Artist/Album/files.

Maybe the more than one directory requirement isn't needed, and the key is high
percentage of media locations (80% right now).

[Kevin Bailey, 2014/05/28 15:05:36]

I lowered the requirement to a single reference but, as predicted, it includes
things your intuition might not. See line 378 where I had to manually exclude
what would be the home directory(~).

+  base::FilePath path;
+  MediaFolderFinder::MediaFolderFinderResults found_folders;
+  std::vector<base::FilePath> sensitive_locations;
+  std::vector<base::FilePath> expected_folders;
+  MediaGalleryScanResult file_counts;
+  file_counts.audio_count = 1;
+  file_counts.image_count = 2;
+  file_counts.video_count = 3;
+  MakeTestFolder("A", &path);
+  // Not enough to be considered.
+  MakeTestFolder("A/B", &path);
+  MakeTestFolder("A/B/C", &path);
+  found_folders[path] = file_counts;
+  // Enough but not dense enough.
+  MakeTestFolder("A/D", &path);
+  MakeTestFolder("A/D/E", &path);
+  found_folders[path] = file_counts;
+  MakeTestFolder("A/D/F", &path);
+  found_folders[path] = file_counts;
+  MakeTestFolder("A/D/G", &path);
+  found_folders[path] = file_counts;
+  MakeTestFolder("A/D/H", &path);
+  // Enough to be reported.
+  MakeTestFolder("A/H", &path);
+  expected_folders.push_back(path);
+  MakeTestFolder("A/H/I", &path);
+  found_folders[path] = file_counts;
+  MakeTestFolder("A/H/J", &path);
+  found_folders[path] = file_counts;
+  MediaFolderFinder::MediaFolderFinderResults results =
+    FindContainerScanResults(found_folders, sensitive_locations);
+  EXPECT_EQ((unsigned)1, results.size());
+  for (std::vector<base::FilePath>::const_iterator it =
+           expected_folders.begin();
+       it != expected_folders.end(); ++it) {
+    EXPECT_TRUE(results.find(*it) != results.end());
+  }
+}
+
+TEST_F(MediaScanManagerTest, MergeRedundantWithSensitive) {
+  base::FilePath path;
+  MediaFolderFinder::MediaFolderFinderResults found_folders;
+  std::vector<base::FilePath> sensitive_locations;
+  std::vector<base::FilePath> expected_folders;
+  MediaGalleryScanResult file_counts;
+  file_counts.audio_count = 1;
+  file_counts.image_count = 2;
+  file_counts.video_count = 3;
+  MakeTestFolder("A", &path);
+  MakeTestFolder("A/B", &path);
+  sensitive_locations.push_back(path);
+  MakeTestFolder("A/C", &path);
+  expected_folders.push_back(path);
+  MakeTestFolder("A/C/G", &path);
+  found_folders[path] = file_counts;
+  MakeTestFolder("A/C/H", &path);
+  found_folders[path] = file_counts;
+  MakeTestFolder("A/D", &path);
+  expected_folders.push_back(path);
+  MakeTestFolder("A/D/I", &path);
+  found_folders[path] = file_counts;
+  MakeTestFolder("A/D/J", &path);
+  found_folders[path] = file_counts;
+  MakeTestFolder("A/E", &path);
+  expected_folders.push_back(path);
+  MakeTestFolder("A/E/K", &path);
+  found_folders[path] = file_counts;
+  MakeTestFolder("A/E/L", &path);
+  found_folders[path] = file_counts;
+  MakeTestFolder("A/F", &path);
+  expected_folders.push_back(path);
+  MakeTestFolder("A/F/M", &path);
+  found_folders[path] = file_counts;
+  MakeTestFolder("A/F/N", &path);
+  found_folders[path] = file_counts;
+  MediaFolderFinder::MediaFolderFinderResults results =
+    FindContainerScanResults(found_folders, sensitive_locations);
+  EXPECT_EQ((unsigned)4, results.size());
+  for (std::vector<base::FilePath>::const_iterator it =
+           expected_folders.begin();
+       it != expected_folders.end(); ++it) {
+    EXPECT_TRUE(results.find(*it) != results.end());
+  }
+}
+
 TEST_F(MediaScanManagerTest, Containers) {
   MediaGalleryScanResult file_counts;
   file_counts.audio_count = 1;