Use BookmarkModelFactory::GetForBrowserContext everywhere

chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 67 matching lines @@
          i < 100 && (test_helper_->GetBookmarkButtonCount() < count ||
                      !test_helper_->GetBookmarkButton(count - 1)->visible());
          ++i) {
       bookmark_bar_view_->SetBounds(0, 0, start_width + i * 10, height);
       bookmark_bar_view_->Layout();
     }
   }
 
   void WaitForBookmarkModelToLoad() {
     bookmarks::test::WaitForBookmarkModelToLoad(
-        BookmarkModelFactory::GetForProfile(profile()));
+        BookmarkModelFactory::GetForBrowserContext(profile()));
   }
 
   // Adds nodes to the bookmark bar node from |string|. See
   // bookmarks::test::AddNodesFromModelString() for details on |string|.
   void AddNodesToBookmarkBarFromModelString(const std::string& string) {
-    BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
+    BookmarkModel* model =
+        BookmarkModelFactory::GetForBrowserContext(profile());
     bookmarks::test::AddNodesFromModelString(model, model->bookmark_bar_node(),
                                              string);
   }
   // Creates the BookmarkBarView and BookmarkBarViewTestHelper. Generally you'll
   // want to use CreateBookmarkModelAndBookmarkBarView(), but use this if
   // need to create the BookmarkBarView after the model has populated.
   void CreateBookmarkBarView() {
     bookmark_bar_view_.reset(new BookmarkBarView(browser(), nullptr));
     test_helper_.reset(new BookmarkBarViewTestHelper(bookmark_bar_view_.get()));
   }
@@ skipping 84 matching lines @@
       0, 0, width_for_one, bookmark_bar_view_->bounds().height());
   bookmark_bar_view_->Layout();
   EXPECT_TRUE(test_helper_->overflow_button()->visible());
 }
 
 // Verifies buttons get added correctly when BookmarkBarView is created after
 // the model and the model has nodes.
 TEST_F(BookmarkBarViewTest, ButtonsDynamicallyAddedAfterModelHasNodes) {
   profile()->CreateBookmarkModel(true);
   WaitForBookmarkModelToLoad();
-  EXPECT_TRUE(BookmarkModelFactory::GetForProfile(profile())->loaded());
+  EXPECT_TRUE(BookmarkModelFactory::GetForBrowserContext(profile())->loaded());
   AddNodesToBookmarkBarFromModelString("a b c d e f ");
   CreateBookmarkBarView();
   EXPECT_EQ(0, test_helper_->GetBookmarkButtonCount());
 
   SizeUntilButtonsVisible(1);
   EXPECT_EQ(2, test_helper_->GetBookmarkButtonCount());
 
   // Go really big, which should force all buttons to be added.
   bookmark_bar_view_->SetBounds(
       0, 0, 5000, bookmark_bar_view_->bounds().height());
   bookmark_bar_view_->Layout();
   EXPECT_EQ(6, test_helper_->GetBookmarkButtonCount());
 }
 
 // Verifies buttons are added as the model and size change.
 TEST_F(BookmarkBarViewTest, ButtonsDynamicallyAdded) {
   CreateBookmarkModelAndBookmarkBarView();
-  EXPECT_TRUE(BookmarkModelFactory::GetForProfile(profile())->loaded());
+  EXPECT_TRUE(BookmarkModelFactory::GetForBrowserContext(profile())->loaded());
   AddNodesToBookmarkBarFromModelString("a b c d e f ");
   EXPECT_EQ(0, test_helper_->GetBookmarkButtonCount());
   SizeUntilButtonsVisible(1);
   EXPECT_EQ(2, test_helper_->GetBookmarkButtonCount());
 
   // Go really big, which should force all buttons to be added.
   bookmark_bar_view_->SetBounds(
       0, 0, 5000, bookmark_bar_view_->bounds().height());
   bookmark_bar_view_->Layout();
   EXPECT_EQ(6, test_helper_->GetBookmarkButtonCount());
 }
 
 TEST_F(BookmarkBarViewTest, AddNodesWhenBarAlreadySized) {
   CreateBookmarkModelAndBookmarkBarView();
   bookmark_bar_view_->SetBounds(
       0, 0, 5000, bookmark_bar_view_->bounds().height());
   AddNodesToBookmarkBarFromModelString("a b c d e f ");
   bookmark_bar_view_->Layout();
   EXPECT_EQ("a b c d e f", GetStringForVisibleButtons());
 }
 
 // Various assertions for removing nodes.
 TEST_F(BookmarkBarViewTest, RemoveNode) {
   CreateBookmarkModelAndBookmarkBarView();
-  BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
+  BookmarkModel* model = BookmarkModelFactory::GetForBrowserContext(profile());
   const BookmarkNode* bookmark_bar_node = model->bookmark_bar_node();
   AddNodesToBookmarkBarFromModelString("a b c d e f ");
   EXPECT_EQ(0, test_helper_->GetBookmarkButtonCount());
   SizeUntilButtonsVisible(1);
   EXPECT_EQ(2, test_helper_->GetBookmarkButtonCount());
 
   // Remove the 2nd node, should still only have 1 visible.
   model->Remove(bookmark_bar_node->GetChild(1));
   EXPECT_EQ("a", GetStringForVisibleButtons());
 
   // Remove the first node, should force a new button (for the 'c' node).
   model->Remove(bookmark_bar_node->GetChild(0));
   ASSERT_EQ("c", GetStringForVisibleButtons());
 }
 
 // Assertions for moving a node on the bookmark bar.
 TEST_F(BookmarkBarViewTest, MoveNode) {
   CreateBookmarkModelAndBookmarkBarView();
-  BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
+  BookmarkModel* model = BookmarkModelFactory::GetForBrowserContext(profile());
   const BookmarkNode* bookmark_bar_node = model->bookmark_bar_node();
   AddNodesToBookmarkBarFromModelString("a b c d e f ");
   EXPECT_EQ(0, test_helper_->GetBookmarkButtonCount());
 
   // Move 'c' first resulting in 'c a b d e f'.
   model->Move(bookmark_bar_node->GetChild(2), bookmark_bar_node, 0);
   EXPECT_EQ(0, test_helper_->GetBookmarkButtonCount());
 
   // Make enough room for 1 node.
   SizeUntilButtonsVisible(1);
@@ skipping 11 matching lines @@
 
   // Move 'c' after 'a', resulting in 'a c b d e f'.
   model->Move(bookmark_bar_node->GetChild(0), bookmark_bar_node, 2);
   SizeUntilButtonsVisible(2);
   EXPECT_EQ("a c", GetStringForVisibleButtons());
 }
 
 // Assertions for changing the title of a node.
 TEST_F(BookmarkBarViewTest, ChangeTitle) {
   CreateBookmarkModelAndBookmarkBarView();
-  BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
+  BookmarkModel* model = BookmarkModelFactory::GetForBrowserContext(profile());
   const BookmarkNode* bookmark_bar_node = model->bookmark_bar_node();
   AddNodesToBookmarkBarFromModelString("a b c d e f ");
   EXPECT_EQ(0, test_helper_->GetBookmarkButtonCount());
 
   model->SetTitle(bookmark_bar_node->GetChild(0), base::ASCIIToUTF16("a1"));
   EXPECT_EQ(0, test_helper_->GetBookmarkButtonCount());
 
   // Make enough room for 1 node.
   SizeUntilButtonsVisible(1);
   EXPECT_EQ("a1", GetStringForVisibleButtons());
@@ skipping 44 matching lines @@
   prefs->SetManagedPref(bookmarks::prefs::kShowAppsShortcutInBookmarkBar,
                         new base::FundamentalValue(false));
   EXPECT_FALSE(test_helper_->apps_page_shortcut()->visible());
 
   // And try showing it via policy too.
   prefs->SetManagedPref(bookmarks::prefs::kShowAppsShortcutInBookmarkBar,
                         new base::FundamentalValue(true));
   EXPECT_TRUE(test_helper_->apps_page_shortcut()->visible());
 }
 #endif