Media Galleries Partial Deprecation: Remove scan functionality.

chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc

Index: chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc
diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc
index 58a074c3c264c69536916c69463197264b325870..1a59f991ea023e3debe1d34d136d624be4b80b99 100644
--- a/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc
+++ b/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc
@@ -19,11 +19,8 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/api/media_galleries/media_galleries_api.h"
 #include "chrome/browser/media_galleries/media_file_system_registry.h"
-#include "chrome/browser/media_galleries/media_folder_finder.h"
 #include "chrome/browser/media_galleries/media_galleries_preferences.h"
-#include "chrome/browser/media_galleries/media_galleries_scan_result_controller.h"
 #include "chrome/browser/media_galleries/media_galleries_test_util.h"
-#include "chrome/browser/media_galleries/media_scan_manager.h"
 #include "chrome/browser/ui/extensions/app_launch_params.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/common/chrome_paths.h"
@@ -71,50 +68,8 @@ base::FilePath::CharType kDevicePath[] = FILE_PATH_LITERAL("C:\\qux");
 base::FilePath::CharType kDevicePath[] = FILE_PATH_LITERAL("/qux");
 #endif
 
-class DoNothingMediaFolderFinder : public MediaFolderFinder {
- public:
-  explicit DoNothingMediaFolderFinder(
-      const MediaFolderFinderResultsCallback& callback)
-      : MediaFolderFinder(callback) {
-  }
-  ~DoNothingMediaFolderFinder() override {}
-
-  static MediaFolderFinder* CreateDoNothingMediaFolderFinder(
-      const MediaFolderFinderResultsCallback& callback) {
-    return new DoNothingMediaFolderFinder(callback);
-  }
-
-  void StartScan() override {}
-
- private:
-};
-
 }  // namespace
 
-class TestMediaGalleriesAddScanResultsFunction
-    : public extensions::MediaGalleriesAddScanResultsFunction {
- public:
-  static ExtensionFunction* Factory() {
-    return new TestMediaGalleriesAddScanResultsFunction;
-  }
-
- protected:
-  ~TestMediaGalleriesAddScanResultsFunction() override {}
-
-  // Accepts the dialog as soon as it is created.
-  MediaGalleriesScanResultController* MakeDialog(
-      content::WebContents* web_contents,
-      const extensions::Extension& extension,
-      const base::Closure& on_finish) override {
-    MediaGalleriesScanResultController* controller =
-        extensions::MediaGalleriesAddScanResultsFunction::MakeDialog(
-            web_contents, extension, on_finish);
-    controller->dialog_->AcceptDialogForTesting();
-    // The dialog is closing or closed so don't return it.
-    return NULL;
-  }
-};
-
 class MediaGalleriesPlatformAppBrowserTest : public PlatformAppBrowserTest {
  protected:
   MediaGalleriesPlatformAppBrowserTest() : test_jpg_size_(0) {}
@@ -400,30 +355,7 @@ class MediaGalleriesPlatformAppBrowserTest : public PlatformAppBrowserTest {
     return ensure_media_directories_exists_.get();
   }
 
-  void InstallDoNothingFolderFinder() {
-    MediaScanManager * scan_manager =
-        g_browser_process->media_file_system_registry()->media_scan_manager();
-    scan_manager->SetMediaFolderFinderFactory(base::Bind(
-        &DoNothingMediaFolderFinder::CreateDoNothingMediaFolderFinder));
-  }
-
-  void SetRootsForFolderFinder(const std::vector<base::FilePath>& roots) {
-    MediaScanManager* scan_manager =
-        g_browser_process->media_file_system_registry()->media_scan_manager();
-    scan_manager->SetMediaFolderFinderFactory(base::Bind(
-        &MediaGalleriesPlatformAppBrowserTest::CreateMediaFolderFinderWithRoots,
-        roots));
-  }
-
  private:
-  static MediaFolderFinder* CreateMediaFolderFinderWithRoots(
-      const std::vector<base::FilePath>& roots,
-      const MediaFolderFinder::MediaFolderFinderResultsCallback& callback) {
-    MediaFolderFinder* finder = new MediaFolderFinder(callback);
-    finder->SetRootsForTesting(roots);
-    return finder;
-  }
-
   MediaGalleriesPreferences* GetAndInitializePreferences() {
     MediaGalleriesPreferences* preferences =
         g_browser_process->media_file_system_registry()->GetPreferences(
@@ -621,51 +553,6 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest,
 }
 #endif  // defined(OS_MACOSX)
 
-IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, CancelScan) {
-  InstallDoNothingFolderFinder();
-  ASSERT_TRUE(RunMediaGalleriesTest("cancel_scan")) << message_;
-}
-
-// Flaky time outs on MSAN. https://crbug.com/503329
-#if defined(MEMORY_SANITIZER)
-#define MAYBE_Scan DISABLED_Scan
-#else
-#define MAYBE_Scan Scan
-#endif
-IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, MAYBE_Scan) {
-  base::ScopedTempDir scan_root;
-  ASSERT_TRUE(scan_root.CreateUniqueTempDir());
-  std::vector<base::FilePath> roots;
-  roots.push_back(scan_root.path());
-  SetRootsForFolderFinder(roots);
-
-  // Override addScanResults so that the dialog is accepted as soon as it is
-  // created.
-  ASSERT_TRUE(extensions::ExtensionFunctionDispatcher::OverrideFunction(
-      "mediaGalleries.addScanResults",
-      &TestMediaGalleriesAddScanResultsFunction::Factory));
-
-  // Add some files and directories to the scan root for testing. Only the
-  // "f" directory should be found.
-  std::string dummy_data;
-  dummy_data.resize(1);
-  ASSERT_TRUE(base::CreateDirectory(scan_root.path().AppendASCII("a/b")));
-  ASSERT_EQ(static_cast<int>(dummy_data.size()),
-            base::WriteFile(scan_root.path().AppendASCII("a/b/c.jpg"),
-                            dummy_data.c_str(), dummy_data.size()));
-  ASSERT_TRUE(base::CreateDirectory(scan_root.path().AppendASCII("a/d")));
-  dummy_data.resize(201 * 1024);  // 200k is the min size for the folder finder.
-  ASSERT_EQ(static_cast<int>(dummy_data.size()),
-            base::WriteFile(scan_root.path().AppendASCII("a/d/e.txt"),
-                            dummy_data.c_str(), dummy_data.size()));
-  ASSERT_TRUE(base::CreateDirectory(scan_root.path().AppendASCII("f")));
-  ASSERT_EQ(static_cast<int>(dummy_data.size()),
-            base::WriteFile(scan_root.path().AppendASCII("f/g.jpg"),
-                            dummy_data.c_str(), dummy_data.size()));
-
-  ASSERT_TRUE(RunMediaGalleriesTest("scan")) << message_;
-}
-
 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, ToURL) {
   RemoveAllGalleries();
   MediaGalleryPrefId pref_id;