chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm - Issue 10827060: Removing instances of profile_->GetBookmarkModel() as part of converting BookmarkModel to a PKS.

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_bubble_controller_unittest.mm

Issue 10827060: Removing instances of profile_->GetBookmarkModel() as part of converting BookmarkModel to a PKS. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 8 years, 5 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_view_unittest.mm ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

--- chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm (revision 148477)

+++ chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm (working copy)

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

#include "base/memory/scoped_nsobject.h"

#include "base/string16.h"

#include "base/utf_string_conversions.h"

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

#import "chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h"

#include "chrome/browser/ui/cocoa/browser_window_controller.h"

#include "chrome/browser/ui/cocoa/cocoa_profile_test.h"

@@ -79,7 +80,8 @@

}

controller_ = [[BookmarkBubbleController alloc]

initWithParentWindow:test_window()

- model:profile()->GetBookmarkModel()

+ model:BookmarkModelFactory::GetForProfile(

+ profile())

node:node

alreadyBookmarked:YES];

EXPECT_TRUE([controller_ window]);

@@ -90,7 +92,7 @@

}

BookmarkModel* GetBookmarkModel() {

- return profile()->GetBookmarkModel();

+ return BookmarkModelFactory::GetForProfile(profile());

}

bool IsWindowClosing() {

@@ -395,7 +397,7 @@

BookmarkBubbleController* controller =

[[BookmarkBubbleController alloc]

initWithParentWindow:test_window()

- model:profile()->GetBookmarkModel()

+ model:BookmarkModelFactory::GetForProfile(profile())

node:node

alreadyBookmarked:NO]; // The last param is the key difference.

EXPECT_TRUE([controller window]);