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

content/public/test/mock_download_manager.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/public/test/mock_download_manager.h"
 
 #include "content/browser/byte_stream.h"
 #include "content/browser/download/download_create_info.h"
 
 namespace content {
 
 MockDownloadManager::CreateDownloadItemAdapter::CreateDownloadItemAdapter(
     uint32_t id,
     const base::FilePath& current_path,
     const base::FilePath& target_path,
     const std::vector<GURL>& url_chain,
     const GURL& referrer_url,
     const std::string& mime_type,
     const std::string& original_mime_type,
     const base::Time& start_time,
     const base::Time& end_time,
     const std::string& etag,
     const std::string& last_modified,
     int64_t received_bytes,
     int64_t total_bytes,
+    const std::string& hash,
     DownloadItem::DownloadState state,
     DownloadDangerType danger_type,
     DownloadInterruptReason interrupt_reason,
     bool opened)
     : id(id),
       current_path(current_path),
       target_path(target_path),
       url_chain(url_chain),
       referrer_url(referrer_url),
       mime_type(mime_type),
       original_mime_type(original_mime_type),
       start_time(start_time),
       end_time(end_time),
       received_bytes(received_bytes),
       total_bytes(total_bytes),
+      hash(hash),
       state(state),
       danger_type(danger_type),
       interrupt_reason(interrupt_reason),
       opened(opened) {}
 
 MockDownloadManager::CreateDownloadItemAdapter::CreateDownloadItemAdapter(
     const CreateDownloadItemAdapter& rhs)
     : id(rhs.id),
       current_path(rhs.current_path),
       target_path(rhs.target_path),
@@ skipping 51 matching lines @@
     const std::vector<GURL>& url_chain,
     const GURL& referrer_url,
     const std::string& mime_type,
     const std::string& original_mime_type,
     const base::Time& start_time,
     const base::Time& end_time,
     const std::string& etag,
     const std::string& last_modified,
     int64_t received_bytes,
     int64_t total_bytes,
+    const std::string& hash,
     DownloadItem::DownloadState state,
     DownloadDangerType danger_type,
     DownloadInterruptReason interrupt_reason,
     bool opened) {
-  CreateDownloadItemAdapter adapter(
-      id, current_path, target_path, url_chain, referrer_url, mime_type,
-      original_mime_type, start_time, end_time, etag, last_modified,
-      received_bytes, total_bytes, state, danger_type, interrupt_reason,
-      opened);
+  CreateDownloadItemAdapter adapter(id, current_path, target_path, url_chain,
+                                    referrer_url, mime_type, original_mime_type,
+                                    start_time, end_time, etag, last_modified,
+                                    received_bytes, total_bytes, hash, state,
+                                    danger_type, interrupt_reason, opened);
   return MockCreateDownloadItem(adapter);
 }
 
 }  // namespace content