| Index: chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm
|
| diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm
|
| index 7e9a3b032159d32658d7e9b4a4810f3ddcc3a1fa..d5c13291304bee3e9163ac6dc75c64c81a9b930b 100644
|
| --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm
|
| +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm
|
| @@ -25,7 +25,7 @@ class BookmarkNameFolderControllerTest : public CocoaProfileTest {
|
|
|
| // Simple add of a node (at the end).
|
| TEST_F(BookmarkNameFolderControllerTest, AddNew) {
|
| - BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
|
| + BookmarkModel* model = BookmarkModelFactory::GetForBrowserContext(profile());
|
| const BookmarkNode* parent = model->bookmark_bar_node();
|
| EXPECT_EQ(0, parent->child_count());
|
|
|
| @@ -54,7 +54,7 @@ TEST_F(BookmarkNameFolderControllerTest, AddNew) {
|
|
|
| // Add new but specify a sibling.
|
| TEST_F(BookmarkNameFolderControllerTest, AddNewWithSibling) {
|
| - BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
|
| + BookmarkModel* model = BookmarkModelFactory::GetForBrowserContext(profile());
|
| const BookmarkNode* parent = model->bookmark_bar_node();
|
|
|
| // Add 2 nodes. We will place the new folder in the middle of these.
|
| @@ -83,7 +83,7 @@ TEST_F(BookmarkNameFolderControllerTest, AddNewWithSibling) {
|
|
|
| // Make sure we are allowed to create a folder named "New Folder".
|
| TEST_F(BookmarkNameFolderControllerTest, AddNewDefaultName) {
|
| - BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
|
| + BookmarkModel* model = BookmarkModelFactory::GetForBrowserContext(profile());
|
| const BookmarkNode* parent = model->bookmark_bar_node();
|
| EXPECT_EQ(0, parent->child_count());
|
|
|
| @@ -103,7 +103,7 @@ TEST_F(BookmarkNameFolderControllerTest, AddNewDefaultName) {
|
|
|
| // Make sure we are allowed to create a folder with an empty name.
|
| TEST_F(BookmarkNameFolderControllerTest, AddNewBlankName) {
|
| - BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
|
| + BookmarkModel* model = BookmarkModelFactory::GetForBrowserContext(profile());
|
| const BookmarkNode* parent = model->bookmark_bar_node();
|
| EXPECT_EQ(0, parent->child_count());
|
|
|
| @@ -122,7 +122,7 @@ TEST_F(BookmarkNameFolderControllerTest, AddNewBlankName) {
|
| }
|
|
|
| TEST_F(BookmarkNameFolderControllerTest, Rename) {
|
| - BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
|
| + BookmarkModel* model = BookmarkModelFactory::GetForBrowserContext(profile());
|
| const BookmarkNode* parent = model->bookmark_bar_node();
|
| const BookmarkNode* folder = model->AddFolder(parent,
|
| parent->child_count(),
|
| @@ -145,7 +145,7 @@ TEST_F(BookmarkNameFolderControllerTest, Rename) {
|
| }
|
|
|
| TEST_F(BookmarkNameFolderControllerTest, EditAndConfirmOKButton) {
|
| - BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
|
| + BookmarkModel* model = BookmarkModelFactory::GetForBrowserContext(profile());
|
| const BookmarkNode* parent = model->bookmark_bar_node();
|
| EXPECT_EQ(0, parent->child_count());
|
|
|
|
|