chrome/browser/history/history_backend_unittest.cc - Issue 1912: Renames BoomarkBarModel to BookmarkModel.

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

Issue 1912: Renames BoomarkBarModel to BookmarkModel. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 12 years, 3 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/dom_ui/new_tab_ui.h ('K') | « chrome/browser/history/expire_history_backend_unittest.cc ('k') | chrome/browser/history/starred_url_database.cc » ('j') | chrome/browser/history_model.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/history/history_backend_unittest.cc

===================================================================

--- chrome/browser/history/history_backend_unittest.cc (revision 1988)

+++ chrome/browser/history/history_backend_unittest.cc (working copy)

@@ -5,7 +5,7 @@

#include "base/file_util.h"

#include "base/path_service.h"

#include "base/scoped_ptr.h"

-#include "chrome/browser/bookmarks/bookmark_bar_model.h"

+#include "chrome/browser/bookmarks/bookmark_model.h"

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

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

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

@@ -69,7 +69,7 @@

backend_->AddPage(request);

}

- BookmarkBarModel bookmark_model_;

+ BookmarkModel bookmark_model_;

protected:

bool loaded_;

@@ -315,7 +315,7 @@

// Unstar row2.

bookmark_model_.SetURLStarred(row2.url(), std::wstring(), false);

// Tell the backend it was unstarred. We have to explicitly do this as

- // BookmarkBarModel isn't wired up to the backend during testing.

+ // BookmarkModel isn't wired up to the backend during testing.

std::set<GURL> unstarred_urls;

unstarred_urls.insert(row2.url());

backend_->URLsNoLongerBookmarked(unstarred_urls);

@@ -329,7 +329,7 @@

// Unstar row 1.

bookmark_model_.SetURLStarred(row1.url(), std::wstring(), false);

// Tell the backend it was unstarred. We have to explicitly do this as

- // BookmarkBarModel isn't wired up to the backend during testing.

+ // BookmarkModel isn't wired up to the backend during testing.

unstarred_urls.clear();

unstarred_urls.insert(row1.url());

backend_->URLsNoLongerBookmarked(unstarred_urls);