[Downloads] Move client guid for AV scanning of downloaded files to chrome/

chrome/browser/media_galleries/fileapi/scanning_file_validator.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/media_galleries/fileapi/supported_image_type_validator.h"
+#include "chrome/browser/media_galleries/fileapi/scanning_file_validator.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/files/scoped_platform_file_closer.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/stl_util.h"
 #include "base/threading/thread_restrictions.h"
-#include "chrome/browser/image_decoder.h"
 #include "content/public/browser/browser_thread.h"
 
+#if defined(OS_WIN)
+#include "base/file_util.h"
+#endif
+
 using content::BrowserThread;
 
 namespace chrome {
 
 namespace {
 
 // Arbitrary limit to sanity check the file size.
 const int kMaxImageFileSize = 50*1014*1024;
 
 scoped_ptr<std::string> ReadOnFileThread(const base::FilePath& path) {
@@ skipping 15 matching lines @@
   result.reset(new std::string);
   result->resize(file_info.size);
   if (base::ReadPlatformFile(file, 0, string_as_array(result.get()),
                              file_info.size) != file_info.size) {
     result.reset();
   }
 
   return result.Pass();
 }
 
-class ImageDecoderDelegateAdapter : public ImageDecoder::Delegate {
- public:
-  ImageDecoderDelegateAdapter(
-      scoped_ptr<std::string> data,
-      const fileapi::CopyOrMoveFileValidator::ResultCallback& callback)
-      : data_(data.Pass()),
-        callback_(callback) {
-    DCHECK(data_);
-  }
+#if defined(OS_WIN)
+base::PlatformFileError ScanFile(
+    const base::FilePath& dest_platform_path) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+  base::PlatformFileError result = base::PLATFORM_FILE_OK;
 
-  const std::string& data() {
-    return *data_;
-  }
+  // Execute an AV check of the transferred file. S_OK means
+  // the file was OK. Other results may indicate the file was
+  // deleted. Any other results, including E_FAIL and
+  // INET_E_SECURITY_PROBLEM, are notified as security errors.
+  HRESULT scan_result =
+      base::ScanAndSaveDownloadedFile(dest_platform_path, std::string());
+  if (scan_result != S_OK)
+    result = base::PLATFORM_FILE_ERROR_SECURITY;
 
-  // ImageDecoder::Delegate methods.
-  virtual void OnImageDecoded(const ImageDecoder* /*decoder*/,
-                              const SkBitmap& /*decoded_image*/) OVERRIDE {
-    callback_.Run(base::PLATFORM_FILE_OK);
-    delete this;
-  }
+  return result;
+}
+#endif
 
-  virtual void OnDecodeImageFailed(const ImageDecoder* /*decoder*/) OVERRIDE {
-    callback_.Run(base::PLATFORM_FILE_ERROR_SECURITY);
-    delete this;
-  }
-
- private:
-  scoped_ptr<std::string> data_;
-  fileapi::CopyOrMoveFileValidator::ResultCallback callback_;
-
-  DISALLOW_COPY_AND_ASSIGN(ImageDecoderDelegateAdapter);
-};
 
 }  // namespace
 
 SupportedImageTypeValidator::~SupportedImageTypeValidator() {}
 
 // static
 bool SupportedImageTypeValidator::SupportsFileType(const base::FilePath& path) {
   base::FilePath::StringType extension = path.Extension();
   return extension == FILE_PATH_LITERAL(".bmp") ||
          extension == FILE_PATH_LITERAL(".gif") ||
@@ skipping 17 matching lines @@
       FROM_HERE,
       base::Bind(&ReadOnFileThread, path_),
       base::Bind(&SupportedImageTypeValidator::OnFileOpen,
                  weak_factory_.GetWeakPtr()));
 }
 
 void SupportedImageTypeValidator::StartPostWriteValidation(
     const base::FilePath& dest_platform_path,
     const ResultCallback& result_callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  post_write_callback_ = result_callback;
 
-  // TODO(gbillock): Insert AV call here in the right validator.
+#if defined(OS_WIN)
+  BrowserThread::PostTaskAndReplyWithResult(
+      BrowserThread::FILE,
+      FROM_HERE,
+      base::Bind(&ScanFile, dest_platform_path),
+      result_callback);
+#else
   BrowserThread::PostTask(

[vandebo (ex-Chrome), 2013/08/05 18:05:30]

no need to post task here, just run the callback.

[Greg Billock, 2013/08/05 21:42:30]

Done.

       BrowserThread::IO,
       FROM_HERE,
-      base::Bind(post_write_callback_, base::PLATFORM_FILE_OK));
+      base::Bind(result_callback, base::PLATFORM_FILE_OK));
+#endif
 }
 
 SupportedImageTypeValidator::SupportedImageTypeValidator(
     const base::FilePath& path)
     : path_(path),
       weak_factory_(this) {
 }
 
 void SupportedImageTypeValidator::OnFileOpen(scoped_ptr<std::string> data) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (!data.get()) {
     callback_.Run(base::PLATFORM_FILE_ERROR_SECURITY);
     return;
   }
 
-  // |adapter| will delete itself after a completion message is received.
-  ImageDecoderDelegateAdapter* adapter =
-      new ImageDecoderDelegateAdapter(data.Pass(), callback_);
-  decoder_ = new ImageDecoder(adapter, adapter->data(),
-                              ImageDecoder::DEFAULT_CODEC);
-  decoder_->Start(content::BrowserThread::GetMessageLoopProxyForThread(
-      BrowserThread::IO));
+  BrowserThread::PostTask(
+      BrowserThread::IO,
+      FROM_HERE,
+      base::Bind(callback_, base::PLATFORM_FILE_OK));
 }
 
 }  // namespace chrome