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

Index: chrome/browser/ui/cocoa/profiles/avatar_icon_controller_unittest.mm

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

index 2176f21436b8b46730ced0da5840ab1762b39695..82cb81bb72a5a46150d2accdb1c5ac6b2293f2ba 100644

--- a/chrome/browser/ui/cocoa/profiles/avatar_icon_controller_unittest.mm

+++ b/chrome/browser/ui/cocoa/profiles/avatar_icon_controller_unittest.mm

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

#include "base/mac/scoped_nsobject.h"

#include "base/strings/utf_string_conversions.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/managed_mode/managed_user_service.h"

#include "chrome/browser/managed_mode/managed_user_service_factory.h"

@@ -108,7 +109,8 @@ TEST_F(AvatarIconControllerTest, ManagedUserLabel) {

AutocompleteClassifierFactory::GetInstance()->SetTestingFactoryAndUse(

profile, &AutocompleteClassifierFactory::BuildInstanceFor);

profile->CreateBookmarkModel(true);

- test::WaitForBookmarkModelToLoad(profile);

+ test::WaitForBookmarkModelToLoad(

+ BookmarkModelFactory::GetForProfile(profile));

Browser* browser =

new Browser(Browser::CreateParams(profile, chrome::GetActiveDesktop()));

« no previous file with comments | « chrome/browser/ui/cocoa/cocoa_profile_test.mm ('k') | chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc » ('j') | no next file with comments »