Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / api / media_galleries / media_galleries_apitest.cc

diff --git a/src/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc b/src/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc
index 299042e..bfbdb81 100644 (file)
--- a/src/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc
+++ b/src/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc
@@ -13,14 +13,16 @@
 #include "base/values.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/extensions/extension_system.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_test_util.h"
-#include "chrome/browser/storage_monitor/storage_info.h"
-#include "chrome/browser/storage_monitor/storage_monitor.h"
+#include "chrome/browser/media_galleries/media_scan_manager.h"
 #include "chrome/common/chrome_paths.h"
+#include "components/storage_monitor/storage_info.h"
+#include "components/storage_monitor/storage_monitor.h"
 #include "content/public/test/test_utils.h"
+#include "extensions/browser/extension_system.h"
 
 #if defined(OS_WIN) || defined(OS_MACOSX)
 #include "chrome/browser/media_galleries/fileapi/picasa_finder.h"
@@ -48,6 +50,30 @@ base::FilePath::CharType kDevicePath[] = FILE_PATH_LITERAL("C:\\qux");
 base::FilePath::CharType kDevicePath[] = FILE_PATH_LITERAL("/qux");
 #endif
 
+void DoNothingMediaFolderFinderResultCallback(
+    bool /*success*/,
+    const MediaFolderFinder::MediaFolderFinderResults& /*results*/) {
+}
+
+class DoNothingMediaFolderFinder : public MediaFolderFinder {
+ public:
+  explicit DoNothingMediaFolderFinder(
+      const MediaFolderFinderResultsCallback& callback)
+      : MediaFolderFinder(callback) {
+  }
+  virtual ~DoNothingMediaFolderFinder() {}
+
+  static MediaFolderFinder* CreateDoNothingMediaFolderFinder(
+      const MediaFolderFinderResultsCallback& callback) {
+    return new DoNothingMediaFolderFinder(
+        base::Bind(&DoNothingMediaFolderFinderResultCallback));
+  }
+
+  virtual void StartScan() OVERRIDE {}
+
+ private:
+};
+
 }  // namespace
 
 class MediaGalleriesPlatformAppBrowserTest : public PlatformAppBrowserTest {
@@ -325,6 +351,13 @@ 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));
+  }
+
  private:
   MediaGalleriesPreferences* GetAndInitializePreferences() {
     MediaGalleriesPreferences* preferences =
@@ -446,3 +479,8 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest,
   iapps::SetMacPreferencesForTesting(NULL);
 }
 #endif  // defined(OS_MACOSX)
+
+IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, Scan) {
+  InstallDoNothingFolderFinder();
+  ASSERT_TRUE(RunMediaGalleriesTest("scan")) << message_;
+}