chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_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_cell_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_bubble_controller_unittest.mm ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_button_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_cell_unittest.mm

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

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

+++ chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_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_cell.h"

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

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

@@ -95,7 +96,7 @@

[cell setMenu:[[[BookmarkMenu alloc] initWithTitle:@"foo"] autorelease]];

EXPECT_FALSE([cell menu]);

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

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

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

[cell setEmpty:NO];

[cell setBookmarkNode:node];

@@ -108,7 +109,7 @@

}

TEST_F(BookmarkButtonCellTest, BookmarkNode) {

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

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

scoped_nsobject<BookmarkButtonCell> cell(

[[BookmarkButtonCell alloc] initTextCell:@"Testing"]);

@@ -157,7 +158,7 @@

// Subfolder arrow details.

TEST_F(BookmarkButtonCellTest, FolderArrow) {

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

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

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

const BookmarkNode* node = model->AddURL(bar, bar->child_count(),

ASCIIToUTF16("title"),

@@ -181,7 +182,7 @@

}

TEST_F(BookmarkButtonCellTest, VerticalTextOffset) {

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

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

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

const BookmarkNode* node = model->AddURL(bar, bar->child_count(),

ASCIIToUTF16("title"),