chrome/browser/history/in_memory_url_index.cc - Issue 285233012: Abstract history dependencies on bookmarks through HistoryClient

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

Issue 285233012: Abstract history dependencies on bookmarks through HistoryClient (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix unit tests Created 6 years, 7 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

« chrome/browser/history/history_service_factory.cc ('K') | « chrome/browser/history/in_memory_url_index.h ('k') | chrome/browser/history/in_memory_url_index_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/history/in_memory_url_index.cc

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

index 21797d7f280dbef37fa514ab0b59ab2bec381e5c..9460e285f1cf3d28025909aafc5283eabe829b13 100644

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

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

@@ -90,8 +90,10 @@ InMemoryURLIndex::RebuildPrivateDataFromHistoryDBTask::

InMemoryURLIndex::InMemoryURLIndex(Profile* profile,

const base::FilePath& history_dir,

- const std::string& languages)

+ const std::string& languages,

+ HistoryClient* history_client)

: profile_(profile),

+ history_client_(history_client),

history_dir_(history_dir),

languages_(languages),

private_data_(new URLIndexPrivateData),

@@ -114,6 +116,7 @@ InMemoryURLIndex::InMemoryURLIndex(Profile* profile,

// Called only by unit tests.

InMemoryURLIndex::InMemoryURLIndex()

: profile_(NULL),

+ history_client_(NULL),

private_data_(new URLIndexPrivateData),

restore_cache_observer_(NULL),

save_cache_observer_(NULL),

@@ -165,7 +168,7 @@ ScoredHistoryMatches InMemoryURLIndex::HistoryItemsForTerms(

term_string,

cursor_position,

languages_,

- BookmarkModelFactory::GetForProfile(profile_));

+ history_client_);

}

// Updating --------------------------------------------------------------------