chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm - Issue 2216713002: Use BookmarkModelFactory::GetForBrowserContext everywhere

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/bookmarks/bookmark_bar_folder_view_unittest.mm

Issue 2216713002: Use BookmarkModelFactory::GetForBrowserContext everywhere (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bookmarks

Patch Set: Replace in .mm files Created 4 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm

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

index fcb01b33b19e73b35ddc3ee3ecc9adfbf70a95d6..089d304b65bfc1539e229280fadce908c5cb94f5 100644

--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm

+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm

@@ -67,7 +67,7 @@ class BookmarkBarFolderViewTest : public CocoaProfileTest {

view_.reset([[BookmarkBarFolderView alloc] init]);

mock_controller_.reset(GetMockController(

- YES, BookmarkModelFactory::GetForProfile(profile())));

+ YES, BookmarkModelFactory::GetForBrowserContext(profile())));

mock_button_.reset(GetMockButton(mock_controller_.get()));

[view_ awakeFromNib];

@@ -129,7 +129,7 @@ class BookmarkBarFolderViewTest : public CocoaProfileTest {

id GetMockButton(id mock_controller) {

BookmarkModel* bookmark_model =

- BookmarkModelFactory::GetForProfile(profile());

+ BookmarkModelFactory::GetForBrowserContext(profile());

const BookmarkNode* node =

bookmark_model->AddURL(bookmark_model->bookmark_bar_node(),

@@ -167,10 +167,10 @@ TEST_F(BookmarkBarFolderViewTest, BookmarkButtonDragAndDropAcrossProfiles) {

testing_profile_manager()->CreateTestingProfile("other");

other_profile->CreateBookmarkModel(true);

bookmarks::test::WaitForBookmarkModelToLoad(

- BookmarkModelFactory::GetForProfile(other_profile));

+ BookmarkModelFactory::GetForBrowserContext(other_profile));

mock_controller_.reset(GetMockController(

- YES, BookmarkModelFactory::GetForProfile(other_profile)));

+ YES, BookmarkModelFactory::GetForBrowserContext(other_profile)));

[view_ setController:mock_controller_];

id drag_info = GetFakeDragInfoForType(

@@ -212,7 +212,7 @@ TEST_F(BookmarkBarFolderViewTest, BookmarkButtonDropIndicator) {

EXPECT_TRUE([view_ dropIndicatorShown]);

EXPECT_EQ([view_ dropIndicatorPosition], kFakeIndicatorPos);

mock_controller_.reset(GetMockController(

- NO, BookmarkModelFactory::GetForProfile(profile())));

+ NO, BookmarkModelFactory::GetForBrowserContext(profile())));

[view_ setController:mock_controller_];

[[[mock_controller_ expect] andReturnUnsignedInteger:NSDragOperationNone]

draggingEntered:drag_info];