chrome/browser/ui/cocoa/cocoa_profile_test.mm - 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/ui/cocoa/cocoa_profile_test.mm

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/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm ('k') | chrome/browser/ui/cocoa/profiles/avatar_icon_controller_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/cocoa_profile_test.mm

diff --git a/chrome/browser/ui/cocoa/cocoa_profile_test.mm b/chrome/browser/ui/cocoa/cocoa_profile_test.mm

index b8eacf2226f8e81b86930fd67ac494362a2e1bce..52caf514584b112fff158941c4337558892c370b 100644

--- a/chrome/browser/ui/cocoa/cocoa_profile_test.mm

+++ b/chrome/browser/ui/cocoa/cocoa_profile_test.mm

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

#include "base/run_loop.h"

#include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"

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

#include "chrome/browser/bookmarks/bookmark_test_helpers.h"

#include "chrome/browser/browser_process.h"

#include "chrome/browser/search_engines/template_url_service_factory.h"

@@ -49,7 +50,8 @@ void CocoaProfileTest::SetUp() {

ASSERT_TRUE(profile_);

profile_->CreateBookmarkModel(true);

- test::WaitForBookmarkModelToLoad(profile_);

+ test::WaitForBookmarkModelToLoad(

+ BookmarkModelFactory::GetForProfile(profile_));

// TODO(shess): These are needed in case someone creates a browser

// window off of browser_. pkasting indicates that other