Validate image files before writing them to media galleries.

chrome/browser/media_galleries/fileapi/media_file_system_mount_point_provider.cc

Index: chrome/browser/media_galleries/fileapi/media_file_system_mount_point_provider.cc
diff --git a/chrome/browser/media_galleries/fileapi/media_file_system_mount_point_provider.cc b/chrome/browser/media_galleries/fileapi/media_file_system_mount_point_provider.cc
index 50b888ff83497c7777d064960918ca9b44c40ad3..0fa868c4c401185c061f60d34a5b7ae4c3b2b293 100644
--- a/chrome/browser/media_galleries/fileapi/media_file_system_mount_point_provider.cc
+++ b/chrome/browser/media_galleries/fileapi/media_file_system_mount_point_provider.cc
@@ -13,6 +13,7 @@
 #include "base/platform_file.h"
 #include "base/sequenced_task_runner.h"
 #include "chrome/browser/media_galleries/fileapi/itunes/itunes_file_util.h"
+#include "chrome/browser/media_galleries/fileapi/media_file_validator_factory.h"
 #include "chrome/browser/media_galleries/fileapi/media_path_filter.h"
 #include "chrome/browser/media_galleries/fileapi/native_media_file_util.h"
 #include "webkit/blob/local_file_stream_reader.h"
@@ -49,7 +50,8 @@ const char MediaFileSystemMountPointProvider::kMTPDeviceDelegateURLKey[] =
 MediaFileSystemMountPointProvider::MediaFileSystemMountPointProvider(
     const base::FilePath& profile_path)
     : profile_path_(profile_path),
-      media_path_filter_(new MediaPathFilter()),
+      media_path_filter_(new MediaPathFilter),
+      media_copy_or_move_file_validator_factory_(new MediaFileValidatorFactory),
       native_media_file_util_(
           new fileapi::AsyncFileUtilAdapter(new NativeMediaFileUtil())),
       itunes_file_util_(new fileapi::AsyncFileUtilAdapter(
@@ -133,6 +135,7 @@ MediaFileSystemMountPointProvider::GetCopyOrMoveFileValidatorFactory(
   switch (type) {
     case fileapi::kFileSystemTypeNativeMedia:
     case fileapi::kFileSystemTypeDeviceMedia:
+    case fileapi::kFileSystemTypeItunes:

[Greg Billock, 2013/05/22 16:21:59]

Bad merge?

[vandebo (ex-Chrome), 2013/05/22 18:41:17]

No, we'll need this to support writing to iTunes's "import" directory.

       if (!media_copy_or_move_file_validator_factory_) {
         *error_code = base::PLATFORM_FILE_ERROR_SECURITY;
         return NULL;
@@ -148,15 +151,7 @@ void
 MediaFileSystemMountPointProvider::InitializeCopyOrMoveFileValidatorFactory(

[Greg Billock, 2013/05/22 16:21:59]

How about just removing this and call sites?

[vandebo (ex-Chrome), 2013/05/22 18:41:17]

CopyorMoveValidator was added as a generic mechanism and this method is needed
for the test for the generic mechanism.  However, it is no longer needed for our
use.

     fileapi::FileSystemType type,
     scoped_ptr<fileapi::CopyOrMoveFileValidatorFactory> factory) {
-  switch (type) {
-    case fileapi::kFileSystemTypeNativeMedia:
-    case fileapi::kFileSystemTypeDeviceMedia:
-      if (!media_copy_or_move_file_validator_factory_)
-        media_copy_or_move_file_validator_factory_.reset(factory.release());
-      break;
-    default:
-      NOTREACHED();
-  }
+  NOTREACHED();
 }
 
 fileapi::FilePermissionPolicy