chrome/browser/bookmarks/bookmark_test_helpers.cc - Issue 257003004: Remove dependency on bookmark_model_factory from bookmark_test_helpers

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/bookmarks/bookmark_test_helpers.cc

Issue 257003004: Remove dependency on bookmark_model_factory from bookmark_test_helpers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@364433

Patch Set: Fix unit tests on Linux & Windows 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

« no previous file with comments | « chrome/browser/bookmarks/bookmark_test_helpers.h ('k') | chrome/browser/history/android/android_history_provider_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/bookmarks/bookmark_test_helpers.cc

diff --git a/chrome/browser/bookmarks/bookmark_test_helpers.cc b/chrome/browser/bookmarks/bookmark_test_helpers.cc

index 1638bcffd3b6bba984e2e8adff1a38967d735927..424febdbce33c9c6b43fbb29991db2e62e44ba97 100644

--- a/chrome/browser/bookmarks/bookmark_test_helpers.cc

+++ b/chrome/browser/bookmarks/bookmark_test_helpers.cc

@@ -10,7 +10,6 @@

#include "base/logging.h"

#include "base/run_loop.h"

#include "base/strings/utf_string_conversions.h"

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

#include "components/bookmarks/core/browser/base_bookmark_model_observer.h"

#include "components/bookmarks/core/browser/bookmark_model.h"

#include "url/gurl.h"

@@ -110,10 +109,6 @@ void WaitForBookmarkModelToLoad(BookmarkModel* model) {

DCHECK(model->loaded());

}

-void WaitForBookmarkModelToLoad(Profile* profile) {

- WaitForBookmarkModelToLoad(BookmarkModelFactory::GetForProfile(profile));

std::string ModelStringFromNode(const BookmarkNode* node) {

// Since the children of the node are not available as a vector,

// we'll just have to do it the hard way.