Remove dependency on bookmark_model_factory from bookmark_test_helpers

chrome/browser/ui/views/bookmarks/bookmark_bubble_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_bubble_view.h"
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
@@ skipping 11 matching lines @@
 
 class BookmarkBubbleViewTest : public BrowserWithTestWindowTest {
  public:
   BookmarkBubbleViewTest() {}
 
   // testing::Test:
   virtual void SetUp() OVERRIDE {
     BrowserWithTestWindowTest::SetUp();
 
     profile()->CreateBookmarkModel(true);
-    test::WaitForBookmarkModelToLoad(profile());
+    BookmarkModel* bookmark_model =
+        BookmarkModelFactory::GetForProfile(profile());
+    test::WaitForBookmarkModelToLoad(bookmark_model);
 
     bookmark_utils::AddIfNotBookmarked(
-        BookmarkModelFactory::GetForProfile(profile()),
-        GURL(kTestBookmarkURL),
-        base::string16());
+        bookmark_model, GURL(kTestBookmarkURL), base::string16());
   }
 
   virtual void TearDown() OVERRIDE {
     // Make sure the bubble is destroyed before the profile to avoid a crash.
     bubble_.reset();
 
     BrowserWithTestWindowTest::TearDown();
   }
 
   // BrowserWithTestWindowTest:
@@ skipping 42 matching lines @@
 // Verifies that the sync promo is displayed for a user that is not signed in.
 TEST_F(BookmarkBubbleViewTest, SyncPromoNotSignedIn) {
   CreateBubbleView();
   bubble_->Init();
 #if defined(OS_CHROMEOS)
   EXPECT_FALSE(bubble_->sync_promo_view_);
 #else  // !defined(OS_CHROMEOS)
   EXPECT_TRUE(bubble_->sync_promo_view_);
 #endif
 }