Index: chrome/browser/download/download_history_unittest.cc |
diff --git a/chrome/browser/download/download_history_unittest.cc b/chrome/browser/download/download_history_unittest.cc |
index db441eda78751fdd6e98aab1325c0c53eabb6f81..5a4af5b977a61608b9027eb4df856eb224d7e884 100644 |
--- a/chrome/browser/download/download_history_unittest.cc |
+++ b/chrome/browser/download/download_history_unittest.cc |
@@ -2,8 +2,12 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
+#include <stddef.h> |
+#include <stdint.h> |
+ |
#include <vector> |
+#include "base/macros.h" |
#include "base/memory/weak_ptr.h" |
#include "base/rand_util.h" |
#include "base/stl_util.h" |
@@ -346,49 +350,37 @@ class DownloadHistoryTest : public testing::Test { |
GURL referrer(referrer_string); |
std::vector<GURL> url_chain; |
url_chain.push_back(url); |
- InitItem(static_cast<uint32>(items_.size() + 1), |
- base::FilePath(path), |
- base::FilePath(path), |
- url_chain, |
- referrer, |
- "application/octet-stream", |
- "application/octet-stream", |
+ InitItem(static_cast<uint32_t>(items_.size() + 1), base::FilePath(path), |
+ base::FilePath(path), url_chain, referrer, |
+ "application/octet-stream", "application/octet-stream", |
(base::Time::Now() - base::TimeDelta::FromMinutes(10)), |
- (base::Time::Now() - base::TimeDelta::FromMinutes(1)), |
- "Etag", |
- "abc", |
- 100, |
- 100, |
- content::DownloadItem::COMPLETE, |
+ (base::Time::Now() - base::TimeDelta::FromMinutes(1)), "Etag", |
+ "abc", 100, 100, content::DownloadItem::COMPLETE, |
content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, |
- content::DOWNLOAD_INTERRUPT_REASON_NONE, |
- false, |
- std::string(), |
- std::string(), |
- info); |
- } |
- |
- void InitItem( |
- uint32 id, |
- const base::FilePath& current_path, |
- const base::FilePath& target_path, |
- const std::vector<GURL>& url_chain, |
- const GURL& referrer, |
- 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 received_bytes, |
- int64 total_bytes, |
- content::DownloadItem::DownloadState state, |
- content::DownloadDangerType danger_type, |
- content::DownloadInterruptReason interrupt_reason, |
- bool opened, |
- const std::string& by_extension_id, |
- const std::string& by_extension_name, |
- history::DownloadRow* info) { |
+ content::DOWNLOAD_INTERRUPT_REASON_NONE, false, std::string(), |
+ std::string(), info); |
+ } |
+ |
+ void InitItem(uint32_t id, |
+ const base::FilePath& current_path, |
+ const base::FilePath& target_path, |
+ const std::vector<GURL>& url_chain, |
+ const GURL& referrer, |
+ 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, |
+ content::DownloadItem::DownloadState state, |
+ content::DownloadDangerType danger_type, |
+ content::DownloadInterruptReason interrupt_reason, |
+ bool opened, |
+ const std::string& by_extension_id, |
+ const std::string& by_extension_name, |
+ history::DownloadRow* info) { |
DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
size_t index = items_.size(); |