Use BookmarkModelFactory::GetForBrowserContext everywhere

chrome/browser/importer/profile_writer_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/importer/profile_writer.h"
 
 #include <stddef.h>
 
 #include <string>
 
@@ skipping 120 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ProfileWriterTest);
 };
 
 // Add bookmarks via ProfileWriter to profile1 when profile2 also exists.
 TEST_F(ProfileWriterTest, CheckBookmarksWithMultiProfile) {
   TestingProfile profile2;
   profile2.CreateBookmarkModel(true);
 
   BookmarkModel* bookmark_model2 =
-      BookmarkModelFactory::GetForProfile(&profile2);
+      BookmarkModelFactory::GetForBrowserContext(&profile2);
   bookmarks::test::WaitForBookmarkModelToLoad(bookmark_model2);
   bookmarks::AddIfNotBookmarked(
       bookmark_model2, GURL("http://www.bing.com"), base::ASCIIToUTF16("Bing"));
   TestingProfile profile1;
   profile1.CreateBookmarkModel(true);
 
   CreateImportedBookmarksEntries();
   BookmarkModel* bookmark_model1 =
-      BookmarkModelFactory::GetForProfile(&profile1);
+      BookmarkModelFactory::GetForBrowserContext(&profile1);
   bookmarks::test::WaitForBookmarkModelToLoad(bookmark_model1);
 
   scoped_refptr<TestProfileWriter> profile_writer(
       new TestProfileWriter(&profile1));
   profile_writer->AddBookmarks(bookmarks_,
                                base::ASCIIToUTF16("Imported from Firefox"));
 
   std::vector<BookmarkModel::URLAndTitle> url_record1;
   bookmark_model1->GetBookmarks(&url_record1);
   EXPECT_EQ(2u, url_record1.size());
 
   std::vector<BookmarkModel::URLAndTitle> url_record2;
   bookmark_model2->GetBookmarks(&url_record2);
   EXPECT_EQ(1u, url_record2.size());
 }
 
 // Verify that bookmarks are duplicated when added twice.
 TEST_F(ProfileWriterTest, CheckBookmarksAfterWritingDataTwice) {
   TestingProfile profile;
   profile.CreateBookmarkModel(true);
 
   CreateImportedBookmarksEntries();
   BookmarkModel* bookmark_model =
-      BookmarkModelFactory::GetForProfile(&profile);
+      BookmarkModelFactory::GetForBrowserContext(&profile);
   bookmarks::test::WaitForBookmarkModelToLoad(bookmark_model);
 
   scoped_refptr<TestProfileWriter> profile_writer(
       new TestProfileWriter(&profile));
   profile_writer->AddBookmarks(bookmarks_,
                                base::ASCIIToUTF16("Imported from Firefox"));
   std::vector<BookmarkModel::URLAndTitle> bookmarks_record;
   bookmark_model->GetBookmarks(&bookmarks_record);
   EXPECT_EQ(2u, bookmarks_record.size());
 
@@ skipping 16 matching lines @@
       new TestProfileWriter(&profile));
   profile_writer->AddHistoryPage(pages_, history::SOURCE_FIREFOX_IMPORTED);
   VerifyHistoryCount(&profile);
   size_t original_history_count = history_count_;
   history_count_ = 0;
 
   profile_writer->AddHistoryPage(pages_, history::SOURCE_FIREFOX_IMPORTED);
   VerifyHistoryCount(&profile);
   EXPECT_EQ(original_history_count, history_count_);
 }