bookmarks: Remove a bunch of unnecessary BookmarkModelFactory::GetForProfile() calls.

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 "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/app_list/app_list_util.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view_test_helper.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "chrome/test/base/scoped_testing_local_state.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_pref_service_syncable.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/test/bookmark_test_helpers.h"
 #include "components/search_engines/search_terms_data.h"
 #include "components/search_engines/template_url_service.h"
 #include "components/search_engines/template_url_service_client.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/button/menu_button.h"
 
+using bookmarks::BookmarkModel;
 using bookmarks::BookmarkNode;
 
 class BookmarkBarViewTest : public BrowserWithTestWindowTest {
  public:
   BookmarkBarViewTest() {}
 
   void SetUp() override {
     BrowserWithTestWindowTest::SetUp();
     local_state_.reset(
         new ScopedTestingLocalState(TestingBrowserProcess::GetGlobal()));
@@ skipping 31 matching lines @@
     const int height = bookmark_bar_view_->GetPreferredSize().height();
     for (int i = 0;
          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();
     }
   }
 
-  const BookmarkNode* GetBookmarkBarNode() {
-    return BookmarkModelFactory::GetForProfile(profile())->bookmark_bar_node();
-  }
-
   void WaitForBookmarkModelToLoad() {
     bookmarks::test::WaitForBookmarkModelToLoad(
         BookmarkModelFactory::GetForProfile(profile()));
   }
 
   // Adds nodes to the bookmark bar node from |string|. See
   // bookmarks::test::AddNodesFromModelString() for details on |string|.
   void AddNodesToBookmarkBarFromModelString(const std::string& string) {
-    bookmarks::test::AddNodesFromModelString(
-        BookmarkModelFactory::GetForProfile(profile()),
-        GetBookmarkBarNode(),
-        string);
+    BookmarkModel* model = BookmarkModelFactory::GetForProfile(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()));
   }
 
   // Creates the model, blocking until it loads, then creates the
@@ skipping 124 matching lines @@
   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();
-  const BookmarkNode* bookmark_bar_node =
-      BookmarkModelFactory::GetForProfile(profile())->bookmark_bar_node();
+  BookmarkModel* model = BookmarkModelFactory::GetForProfile(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.
-  BookmarkModelFactory::GetForProfile(profile())
-      ->Remove(bookmark_bar_node->GetChild(1));
+  model->Remove(bookmark_bar_node->GetChild(1));
   EXPECT_EQ("a", GetStringForVisibleButtons());
 
   // Remove the first node, should force a new button (for the 'c' node).
-  BookmarkModelFactory::GetForProfile(profile())
-      ->Remove(bookmark_bar_node->GetChild(0));
+  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();
-  const BookmarkNode* bookmark_bar_node =
-      BookmarkModelFactory::GetForProfile(profile())->bookmark_bar_node();
+  BookmarkModel* model = BookmarkModelFactory::GetForProfile(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'.
-  BookmarkModelFactory::GetForProfile(profile())
-      ->Move(bookmark_bar_node->GetChild(2), bookmark_bar_node, 0);
+  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);
   EXPECT_EQ("c", GetStringForVisibleButtons());
 
   // Move 'f' first, resulting in 'f c a b d e'.
-  BookmarkModelFactory::GetForProfile(profile())
-      ->Move(bookmark_bar_node->GetChild(5), bookmark_bar_node, 0);
+  model->Move(bookmark_bar_node->GetChild(5), bookmark_bar_node, 0);
   SizeUntilButtonsVisible(2);
   EXPECT_EQ("f c", GetStringForVisibleButtons());
 
   // Move 'f' to the end, resulting in 'c a b d e f'.
-  BookmarkModelFactory::GetForProfile(profile())
-      ->Move(bookmark_bar_node->GetChild(0), bookmark_bar_node, 6);
+  model->Move(bookmark_bar_node->GetChild(0), bookmark_bar_node, 6);
   SizeUntilButtonsVisible(2);
   EXPECT_EQ("c a", GetStringForVisibleButtons());
 
   // Move 'c' after 'a', resulting in 'a c b d e f'.
-  BookmarkModelFactory::GetForProfile(profile())
-      ->Move(bookmark_bar_node->GetChild(0), bookmark_bar_node, 2);
+  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();
-  const BookmarkNode* bookmark_bar_node = GetBookmarkBarNode();
+  BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
+  const BookmarkNode* bookmark_bar_node = model->bookmark_bar_node();
   AddNodesToBookmarkBarFromModelString("a b c d e f ");
   EXPECT_EQ(0, test_helper_->GetBookmarkButtonCount());
 
-  BookmarkModelFactory::GetForProfile(profile())
-      ->SetTitle(bookmark_bar_node->GetChild(0), base::ASCIIToUTF16("a1"));
+  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());
 
-  BookmarkModelFactory::GetForProfile(profile())
-      ->SetTitle(bookmark_bar_node->GetChild(1), base::ASCIIToUTF16("b1"));
+  model->SetTitle(bookmark_bar_node->GetChild(1), base::ASCIIToUTF16("b1"));
   EXPECT_EQ("a1", GetStringForVisibleButtons());
 
-  BookmarkModelFactory::GetForProfile(profile())
-      ->SetTitle(bookmark_bar_node->GetChild(5), base::ASCIIToUTF16("f1"));
+  model->SetTitle(bookmark_bar_node->GetChild(5), base::ASCIIToUTF16("f1"));
   EXPECT_EQ("a1", GetStringForVisibleButtons());
 
-  BookmarkModelFactory::GetForProfile(profile())
-      ->SetTitle(bookmark_bar_node->GetChild(3), base::ASCIIToUTF16("d1"));
+  model->SetTitle(bookmark_bar_node->GetChild(3), base::ASCIIToUTF16("d1"));
 
   // Make the second button visible, changes the title of the first to something
   // really long and make sure the second button hides.
   SizeUntilButtonsVisible(2);
   EXPECT_EQ("a1 b1", GetStringForVisibleButtons());
-  BookmarkModelFactory::GetForProfile(profile())
-      ->SetTitle(bookmark_bar_node->GetChild(0),
-                 base::ASCIIToUTF16("a_really_long_title"));
+  model->SetTitle(bookmark_bar_node->GetChild(0),
+                  base::ASCIIToUTF16("a_really_long_title"));
   EXPECT_LE(1, test_helper_->GetBookmarkButtonCount());
 
   // Change the title back and make sure the 2nd button is visible again. Don't
   // use GetStringForVisibleButtons() here as more buttons may have been
   // created.
-  BookmarkModelFactory::GetForProfile(profile())
-      ->SetTitle(bookmark_bar_node->GetChild(0), base::ASCIIToUTF16("a1"));
+  model->SetTitle(bookmark_bar_node->GetChild(0), base::ASCIIToUTF16("a1"));
   ASSERT_LE(2, test_helper_->GetBookmarkButtonCount());
   EXPECT_TRUE(test_helper_->GetBookmarkButton(0)->visible());
   EXPECT_TRUE(test_helper_->GetBookmarkButton(1)->visible());
 
   bookmark_bar_view_->SetBounds(
       0, 0, 5000, bookmark_bar_view_->bounds().height());
   bookmark_bar_view_->Layout();
   EXPECT_EQ("a1 b1 c d1 e f1", GetStringForVisibleButtons());
 }
 
@@ skipping 12 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