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

content/public/test/mock_download_manager.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_TEST_MOCK_DOWNLOAD_MANAGER_H_
 #define CONTENT_PUBLIC_TEST_MOCK_DOWNLOAD_MANAGER_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 25 matching lines @@
     std::vector<GURL> url_chain;
     GURL referrer_url;
     std::string mime_type;
     std::string original_mime_type;
     base::Time start_time;
     base::Time end_time;
     std::string etag;
     std::string last_modified;
     int64_t received_bytes;
     int64_t total_bytes;
+    std::string hash;
     DownloadItem::DownloadState state;
     DownloadDangerType danger_type;
     DownloadInterruptReason interrupt_reason;
     bool opened;
 
     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);
     // Required by clang compiler.
     CreateDownloadItemAdapter(const CreateDownloadItemAdapter& rhs);
     ~CreateDownloadItemAdapter();
 
     bool operator==(const CreateDownloadItemAdapter& rhs) const;
   };
@@ skipping 35 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) override;
 
   MOCK_METHOD1(MockCreateDownloadItem,
                DownloadItem*(CreateDownloadItemAdapter adapter));
 
   MOCK_CONST_METHOD0(InProgressCount, int());
   MOCK_CONST_METHOD0(NonMaliciousInProgressCount, int());
   MOCK_CONST_METHOD0(GetBrowserContext, BrowserContext*());
   MOCK_METHOD0(CheckForHistoryFilesRemoval, void());
   MOCK_METHOD1(GetDownload, DownloadItem*(uint32_t id));
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_TEST_MOCK_DOWNLOAD_MANAGER_H_