chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc - Issue 833033002: Remove dependency on //content from history DownloadDatabase

Unified Diff: chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc

Issue 833033002: Remove dependency on //content from history DownloadDatabase (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove obsolete #include Created 5 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/safe_browsing/incident_reporting/last_download_finder.cc ('k') | chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc

diff --git a/chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc

index ced861c154eb71497824d240c8362e2764b7e1b7..b61cad35072b27ba63b6342a87e334b870ce93e1 100644

--- a/chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc

+++ b/chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc

@@ -15,7 +15,6 @@

#include "base/strings/utf_string_conversions.h"

#include "chrome/browser/history/chrome_history_client.h"

#include "chrome/browser/history/chrome_history_client_factory.h"

-#include "chrome/browser/history/download_row.h"

#include "chrome/browser/history/history_service.h"

#include "chrome/browser/history/history_service_factory.h"

#include "chrome/browser/history/web_history_service_factory.h"

@@ -28,6 +27,9 @@

#include "chrome/test/base/testing_pref_service_syncable.h"

#include "chrome/test/base/testing_profile.h"

#include "chrome/test/base/testing_profile_manager.h"

+#include "components/history/content/browser/download_constants_utils.h"

+#include "components/history/core/browser/download_constants.h"

+#include "components/history/core/browser/download_row.h"

#include "components/history/core/browser/history_constants.h"

#include "content/public/test/test_browser_thread_bundle.h"

#include "content/public/test/test_utils.h"

@@ -218,20 +220,21 @@ class LastDownloadFinderTest : public testing::Test {

std::vector<GURL>(1, GURL("http://www.google.com")), // url_chain

GURL(), // referrer

"application/octet-stream", // mime_type

- "application/octet-stream", // original_mime_type

- now - base::TimeDelta::FromMinutes(10), // start

- now - base::TimeDelta::FromMinutes(9), // end

- std::string(), // etag

- std::string(), // last_modified

- 47LL, // received

- 47LL, // total

- content::DownloadItem::COMPLETE, // download_state

- content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, // danger_type

- content::DOWNLOAD_INTERRUPT_REASON_NONE, // interrupt_reason,

- 1, // id

- false, // download_opened

- std::string(), // ext_id

- std::string()); // ext_name

+ "application/octet-stream", // original_mime_type

+ now - base::TimeDelta::FromMinutes(10), // start

+ now - base::TimeDelta::FromMinutes(9), // end

+ std::string(), // etag

+ std::string(), // last_modified

+ 47LL, // received

+ 47LL, // total

+ history::DownloadState::COMPLETE, // download_state

+ history::DownloadDangerType::NOT_DANGEROUS, // danger_type

+ history::ToHistoryDownloadInterruptReason(

+ content::DOWNLOAD_INTERRUPT_REASON_NONE), // interrupt_reason,

+ 1, // id

+ false, // download_opened

+ std::string(), // ext_id

+ std::string()); // ext_name

}

void ExpectNoDownloadFound(