[MediaGalleries] Introduce an AV-checking base class for copy-move validation

chrome/browser/media_galleries/fileapi/supported_image_type_validator.h

Index: chrome/browser/media_galleries/fileapi/supported_image_type_validator.h
diff --git a/chrome/browser/media_galleries/fileapi/supported_image_type_validator.h b/chrome/browser/media_galleries/fileapi/supported_image_type_validator.h
index c74d76264aa5086e7eea52e8db3668364ef3756f..11e479f6ae2ecf1b8194627e8a322299cf0f7519 100644
--- a/chrome/browser/media_galleries/fileapi/supported_image_type_validator.h
+++ b/chrome/browser/media_galleries/fileapi/supported_image_type_validator.h
@@ -9,7 +9,7 @@
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "webkit/browser/fileapi/copy_or_move_file_validator.h"
+#include "chrome/browser/media_galleries/fileapi/av_scanning_file_validator.h"
 
 class ImageDecoder;
 
@@ -19,7 +19,7 @@ class MediaFileValidatorFactory;
 
 // Use ImageDecoder to determine if the file decodes without error. Handles
 // image files supported by Chrome.
-class SupportedImageTypeValidator : public fileapi::CopyOrMoveFileValidator {
+class SupportedImageTypeValidator : public AVScanningFileValidator {
  public:
   virtual ~SupportedImageTypeValidator();
 
@@ -28,10 +28,6 @@ class SupportedImageTypeValidator : public fileapi::CopyOrMoveFileValidator {
   virtual void StartPreWriteValidation(
       const ResultCallback& result_callback) OVERRIDE;
 
-  virtual void StartPostWriteValidation(
-      const base::FilePath& dest_platform_path,
-      const ResultCallback& result_callback) OVERRIDE;
-
  private:
   friend class MediaFileValidatorFactory;
 
@@ -42,7 +38,6 @@ class SupportedImageTypeValidator : public fileapi::CopyOrMoveFileValidator {
   base::FilePath path_;
   scoped_refptr<ImageDecoder> decoder_;
   fileapi::CopyOrMoveFileValidator::ResultCallback callback_;
-  fileapi::CopyOrMoveFileValidator::ResultCallback post_write_callback_;
   base::WeakPtrFactory<SupportedImageTypeValidator> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SupportedImageTypeValidator);