Media Galleries Partial Deprecation: Remove scan functionality.

chrome/browser/media_galleries/fileapi/media_path_filter.cc

Index: chrome/browser/media_galleries/fileapi/media_path_filter.cc
diff --git a/chrome/browser/media_galleries/fileapi/media_path_filter.cc b/chrome/browser/media_galleries/fileapi/media_path_filter.cc
index de14bb692947ea7e62ea167fb841e7ea850fafc8..34807dfc0483d444575df89a6e5b59a376c00038 100644
--- a/chrome/browser/media_galleries/fileapi/media_path_filter.cc
+++ b/chrome/browser/media_galleries/fileapi/media_path_filter.cc
@@ -148,16 +148,16 @@ MediaPathFilter::~MediaPathFilter() {
 }
 
 bool MediaPathFilter::Match(const base::FilePath& path) {
-  return GetType(path) != MEDIA_GALLERY_SCAN_FILE_TYPE_UNKNOWN;
+  return GetType(path) != MEDIA_GALLERY_FILE_TYPE_UNKNOWN;
 }
 
-MediaGalleryScanFileType MediaPathFilter::GetType(const base::FilePath& path) {
+MediaGalleryFileType MediaPathFilter::GetType(const base::FilePath& path) {
   EnsureInitialized();
   MediaFileExtensionMap::const_iterator it =
       media_file_extensions_map_.find(base::ToLowerASCII(path.Extension()));
   if (it == media_file_extensions_map_.end())
-    return MEDIA_GALLERY_SCAN_FILE_TYPE_UNKNOWN;
-  return static_cast<MediaGalleryScanFileType>(it->second);
+    return MEDIA_GALLERY_FILE_TYPE_UNKNOWN;
+  return static_cast<MediaGalleryFileType>(it->second);
 }
 
 void MediaPathFilter::EnsureInitialized() {
@@ -169,30 +169,27 @@ void MediaPathFilter::EnsureInitialized() {
   // doing this in the ctor and removing |initialized_| would result in a
   // ThreadRestrictions failure.
   AddExtensionsToMediaFileExtensionMap(GetMediaExtensionList("image/*"),
-                                       MEDIA_GALLERY_SCAN_FILE_TYPE_IMAGE);
+                                       MEDIA_GALLERY_FILE_TYPE_IMAGE);
   AddExtensionsToMediaFileExtensionMap(GetMediaExtensionList("audio/*"),
-                                       MEDIA_GALLERY_SCAN_FILE_TYPE_AUDIO);
+                                       MEDIA_GALLERY_FILE_TYPE_AUDIO);
   AddExtensionsToMediaFileExtensionMap(GetMediaExtensionList("video/*"),
-                                       MEDIA_GALLERY_SCAN_FILE_TYPE_VIDEO);
+                                       MEDIA_GALLERY_FILE_TYPE_VIDEO);
   AddAdditionalExtensionsToMediaFileExtensionMap(
-      kExtraSupportedImageExtensions,
-      arraysize(kExtraSupportedImageExtensions),
-      MEDIA_GALLERY_SCAN_FILE_TYPE_IMAGE);
+      kExtraSupportedImageExtensions, arraysize(kExtraSupportedImageExtensions),
+      MEDIA_GALLERY_FILE_TYPE_IMAGE);
   AddAdditionalExtensionsToMediaFileExtensionMap(
-      kExtraSupportedAudioExtensions,
-      arraysize(kExtraSupportedAudioExtensions),
-      MEDIA_GALLERY_SCAN_FILE_TYPE_AUDIO);
+      kExtraSupportedAudioExtensions, arraysize(kExtraSupportedAudioExtensions),
+      MEDIA_GALLERY_FILE_TYPE_AUDIO);
   AddAdditionalExtensionsToMediaFileExtensionMap(
-      kExtraSupportedVideoExtensions,
-      arraysize(kExtraSupportedVideoExtensions),
-      MEDIA_GALLERY_SCAN_FILE_TYPE_VIDEO);
+      kExtraSupportedVideoExtensions, arraysize(kExtraSupportedVideoExtensions),
+      MEDIA_GALLERY_FILE_TYPE_VIDEO);
 
   initialized_ = true;
 }
 
 void MediaPathFilter::AddExtensionsToMediaFileExtensionMap(
     const MediaFileExtensionList& extensions_list,
-    MediaGalleryScanFileType type) {
+    MediaGalleryFileType type) {
   for (size_t i = 0; i < extensions_list.size(); ++i)
     AddExtensionToMediaFileExtensionMap(extensions_list[i].c_str(), type);
 }
@@ -200,14 +197,14 @@ void MediaPathFilter::AddExtensionsToMediaFileExtensionMap(
 void MediaPathFilter::AddAdditionalExtensionsToMediaFileExtensionMap(
     const base::FilePath::CharType* const* extensions_list,
     size_t extensions_list_size,
-    MediaGalleryScanFileType type) {
+    MediaGalleryFileType type) {
   for (size_t i = 0; i < extensions_list_size; ++i)
     AddExtensionToMediaFileExtensionMap(extensions_list[i], type);
 }
 
 void MediaPathFilter::AddExtensionToMediaFileExtensionMap(
     const base::FilePath::CharType* extension,
-    MediaGalleryScanFileType type) {
+    MediaGalleryFileType type) {
   base::FilePath::StringType extension_with_sep =
       base::FilePath::kExtensionSeparator +
       base::FilePath::StringType(extension);