chrome/browser/history/history_backend.cc - Issue 10870029: Remove legacy migration code that coupled history and bookmarks.

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_backend.cc

Issue 10870029: Remove legacy migration code that coupled history and bookmarks. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Remove obsoleted unit test. Created 8 years, 4 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/history_backend.cc

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

index 9c7d7fa2782c791d2eb6d3ece3d542235e311530..5523199d789d285be0e60fea5dba7f0eec2c608d 100644

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

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

@@ -607,12 +607,10 @@ void HistoryBackend::InitImpl(const std::string& languages) {

FilePath history_name = history_dir_.Append(chrome::kHistoryFilename);

FilePath thumbnail_name = GetThumbnailFileName();

FilePath archived_name = GetArchivedFileName();

- FilePath tmp_bookmarks_file = history_dir_.Append(

- chrome::kHistoryBookmarksFileName);

// History database.

db_.reset(new HistoryDatabase());

- sql::InitStatus status = db_->Init(history_name, tmp_bookmarks_file);

+ sql::InitStatus status = db_->Init(history_name);

switch (status) {

case sql::INIT_OK:

break;