chrome/browser/history/expire_history_backend_unittest.cc - Issue 849323002: Componentize HistoryDatabase

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/expire_history_backend_unittest.cc

Issue 849323002: Componentize HistoryDatabase (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix android compilation 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:

Index: chrome/browser/history/expire_history_backend_unittest.cc

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

index b1cdbbec70de35219dc53410aa0d0701ae2d7890..c63b465daea1b0c4587418409e8b537e2728d204 100644

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

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

@@ -16,15 +16,16 @@

#include "base/strings/string16.h"

#include "base/strings/utf_string_conversions.h"

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

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

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

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

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

#include "chrome/tools/profiles/thumbnail-inl.h"

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

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

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

#include "components/history/core/common/thumbnail_score.h"

#include "components/history/core/test/history_client_fake_bookmarks.h"

+#include "components/history/core/test/test_history_database.h"

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

#include "testing/gtest/include/gtest/gtest.h"

#include "third_party/skia/include/core/SkBitmap.h"

@@ -129,7 +130,7 @@ class ExpireHistoryTest : public testing::Test,

ASSERT_TRUE(tmp_dir_.CreateUniqueTempDir());

base::FilePath history_name = path().Append(kHistoryFile);

- main_db_.reset(new HistoryDatabase);

+ main_db_.reset(new TestHistoryDatabase);

if (main_db_->Init(history_name) != sql::INIT_OK)

main_db_.reset();