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

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

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

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

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

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

#include "base/memory/scoped_nsobject.h"

#include "base/utf_string_conversions.h"

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

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

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

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

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

@@ -86,7 +87,7 @@

// Since this returns (does not actually begin a modal drag), success!

[button beginDrag:downEvent];

- BookmarkModel* model = profile()->GetBookmarkModel();

+ BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());

const BookmarkNode* node = model->bookmark_bar_node();

[cell setBookmarkNode:node];

EXPECT_FALSE([button isEmpty]);

@@ -139,7 +140,7 @@

[button setDelegate:delegate];

// Add a deletable bookmark to the button.

- BookmarkModel* model = profile()->GetBookmarkModel();

+ BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());

const BookmarkNode* barNode = model->bookmark_bar_node();

const BookmarkNode* node = model->AddURL(barNode, 0, ASCIIToUTF16("hi mom"),

GURL("http://www.google.com"));