[Downloads] Rework how hashes are calculated for download files.

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>
@@ skipping 334 matching lines @@
   if (result == 0 && move_info.fAnyOperationsAborted)
     interrupt_reason = DOWNLOAD_INTERRUPT_REASON_FILE_FAILED;
   else if (result != 0)
     interrupt_reason = MapShFileOperationCodes(result);
 
   if (interrupt_reason != DOWNLOAD_INTERRUPT_REASON_NONE)
     return LogInterruptReason("SHFileOperation", result, interrupt_reason);
   return interrupt_reason;
 }
 
-DownloadInterruptReason BaseFile::AnnotateWithSourceInformation() {
+DownloadInterruptReason BaseFile::AnnotateWithSourceInformation(
+    const std::string& client_guid,
+    const GURL& source_url,
+    const GURL& referrer_url) {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
   DCHECK(!detached_);
 
   bound_net_log_.BeginEvent(net::NetLog::TYPE_DOWNLOAD_FILE_ANNOTATED);
   DownloadInterruptReason result = DOWNLOAD_INTERRUPT_REASON_NONE;
-  std::string braces_guid = "{" + client_guid_ + "}";
+  std::string braces_guid = "{" + client_guid + "}";
   GUID guid = GUID_NULL;
-  if (base::IsValidGUID(client_guid_)) {
+  if (base::IsValidGUID(client_guid)) {
     HRESULT hr = CLSIDFromString(
         base::UTF8ToUTF16(braces_guid).c_str(), &guid);
     if (FAILED(hr))
       guid = GUID_NULL;
   }
 
-  HRESULT hr = AVScanFile(full_path_, source_url_.spec(), guid);
+  HRESULT hr = 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