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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/history/history_unittest.cc

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

Patch Set: Fix unit tests and move download_database.{cc,h} 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/history/history_service.cc ('k') | chrome/browser/safe_browsing/incident_reporting/last_download_finder.h » ('j') | components/history/content/browser/download_constants_utils.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/history/history_unittest.cc

diff --git a/chrome/browser/history/history_unittest.cc b/chrome/browser/history/history_unittest.cc

index b836d0c8fc365c736657616c95f8c519afe48093..f6cd01484ebf67d4e4fe848575ede55fc7cdf1b4 100644

--- a/chrome/browser/history/history_unittest.cc

+++ b/chrome/browser/history/history_unittest.cc

@@ -42,7 +42,6 @@

#include "base/task/cancelable_task_tracker.h"

#include "base/threading/platform_thread.h"

#include "base/time/time.h"

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

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

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

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

@@ -52,6 +51,8 @@

#include "chrome/common/chrome_constants.h"

#include "chrome/common/chrome_paths.h"

#include "chrome/tools/profiles/thumbnail-inl.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 "components/history/core/browser/history_db_task.h"

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

@@ -846,7 +847,7 @@ TEST_F(HistoryBackendDBTest, ConfirmDownloadInProgressCleanup) {

sql::Statement statement1(db.GetUniqueStatement(

"Select state, interrupt_reason from downloads"));

EXPECT_TRUE(statement1.Step());

- EXPECT_EQ(DownloadDatabase::kStateInProgress, statement1.ColumnInt(0));

+ EXPECT_EQ(kStateInProgress, statement1.ColumnInt(0));

EXPECT_EQ(content::DOWNLOAD_INTERRUPT_REASON_NONE, statement1.ColumnInt(1));

EXPECT_FALSE(statement1.Step());

}

@@ -876,7 +877,7 @@ TEST_F(HistoryBackendDBTest, ConfirmDownloadInProgressCleanup) {

sql::Statement statement1(db.GetUniqueStatement(

"Select state, interrupt_reason from downloads"));

EXPECT_TRUE(statement1.Step());

- EXPECT_EQ(DownloadDatabase::kStateInterrupted, statement1.ColumnInt(0));

+ EXPECT_EQ(kStateInterrupted, statement1.ColumnInt(0));

EXPECT_EQ(content::DOWNLOAD_INTERRUPT_REASON_CRASH,

statement1.ColumnInt(1));

EXPECT_FALSE(statement1.Step());