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

content/browser/download/base_file_win.cc

 // Copyright (c) 2012 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 "content/browser/download/base_file.h"
 
 #include <windows.h>
+#include <cguid.h>
+#include <objbase.h>
 #include <shellapi.h>
 
 #include "base/file_util.h"
+#include "base/guid.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "content/browser/download/download_interrupt_reasons_impl.h"
 #include "content/browser/download/download_stats.h"
-#include "content/browser/safe_util_win.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace content {
 namespace {
 
 const int kAllSpecialShFileOperationCodes[] = {
   // Should be kept in sync with the case statement below.
   ERROR_ACCESS_DENIED,
   0x71,
   0x72,
@@ skipping 292 matching lines @@
     return LogInterruptReason("SHFileOperation", result, interrupt_reason);
   return interrupt_reason;
 }
 
 DownloadInterruptReason BaseFile::AnnotateWithSourceInformation() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   DCHECK(!detached_);
 
   bound_net_log_.BeginEvent(net::NetLog::TYPE_DOWNLOAD_FILE_ANNOTATED);
   DownloadInterruptReason result = DOWNLOAD_INTERRUPT_REASON_NONE;
-  HRESULT hr = ScanAndSaveDownloadedFile(full_path_, source_url_);
+  GUID guid = GUID_NULL;
+  if (!client_guid_.empty() && base::IsValidGUID(client_guid_)) {
+    HRESULT hr = CLSIDFromString(
+        base::UTF8ToUTF16(client_guid_).c_str(), &guid);
+    if (FAILED(hr))
+      guid = GUID_NULL;
+  }
+  HRESULT hr = base::AVScanFile(full_path_, source_url_.spec(), guid);
 
   // If the download file is missing after the call, then treat this as an
   // interrupted download.
   //
   // If the ScanAndSaveDownloadedFile() call failed, but the downloaded file is
   // still around, then don't interrupt the download. Attachment Execution
   // Services deletes the submitted file if the downloaded file is blocked by
   // policy or if it was found to be infected.
   //
   // If the file is still there, then the error could be due to AES not being
   // available or some other error during the AES invocation. In either case,
   // we don't surface the error to the user.
   if (!base::PathExists(full_path_)) {
     DCHECK(FAILED(hr));
     result = MapScanAndSaveErrorCodeToInterruptReason(hr);
     if (result == DOWNLOAD_INTERRUPT_REASON_NONE) {
       RecordDownloadCount(FILE_MISSING_AFTER_SUCCESSFUL_SCAN_COUNT);
       result = DOWNLOAD_INTERRUPT_REASON_FILE_SECURITY_CHECK_FAILED;
     }
     LogInterruptReason("ScanAndSaveDownloadedFile", hr, result);
   }
   bound_net_log_.EndEvent(net::NetLog::TYPE_DOWNLOAD_FILE_ANNOTATED);
   return result;
 }
 
 }  // namespace content