Have FindContainerScanResults() find broader media container directories

chrome/browser/media_galleries/media_scan_manager.h

 // Copyright 2014 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.
 
 #ifndef CHROME_BROWSER_MEDIA_GALLERIES_MEDIA_SCAN_MANAGER_H_
 #define CHROME_BROWSER_MEDIA_GALLERIES_MEDIA_SCAN_MANAGER_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 35 matching lines @@
 
   // The results of the scan are reported to the registered
   // MediaScanManagerObserver via OnScanFinished. There must be an observer
   // registered for |profile| before the scan starts.
   void StartScan(Profile* profile, const extensions::Extension* extension,
                  bool user_gesture);
   void CancelScan(Profile* profile, const extensions::Extension* extension);
 
  protected:
   friend class MediaGalleriesPlatformAppBrowserTest;
+  friend class MediaScanManagerTest;
 
   typedef base::Callback<MediaFolderFinder*(
       const MediaFolderFinder::MediaFolderFinderResultsCallback&)>
           MediaFolderFinderFactory;
 
   void SetMediaFolderFinderFactory(const MediaFolderFinderFactory& factory);
 
+  // Here so that friend MediaScanManagerTest can access it.
+  static MediaFolderFinder::MediaFolderFinderResults FindContainerScanResults(
+      const MediaFolderFinder::MediaFolderFinderResults& found_folders,
+      const std::vector<base::FilePath>& sensitive_locations);
+
  private:
   struct ScanObservers {
     ScanObservers();
     ~ScanObservers();
     MediaScanManagerObserver* observer;
     std::set<std::string /*extension id*/> scanning_extensions;
   };
   typedef std::map<Profile*, ScanObservers> ScanObserverMap;
 
   // extensions::ExtensionRegistryObserver implementation.
@@ skipping 25 matching lines @@
   ScopedObserver<extensions::ExtensionRegistry,
                  extensions::ExtensionRegistryObserver>
       scoped_extension_registry_observer_;
 
   base::WeakPtrFactory<MediaScanManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaScanManager);
 };
 
 #endif  // CHROME_BROWSER_MEDIA_GALLERIES_MEDIA_SCAN_MANAGER_H_