Removing instances of profile_->GetBookmarkModel() as part of converting BookmarkModel to a PKS.

chrome/browser/autocomplete/history_contents_provider_unittest.cc

 // Copyright (c) 2012 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/autocomplete/history_contents_provider.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/autocomplete_provider_listener.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::Time;
 using base::TimeDelta;
@@ skipping 169 matching lines @@
   EXPECT_EQ(0U, m3.size());
 }
 
 // Tests that the BookmarkModel is queried correctly.
 TEST_F(HistoryContentsProviderTest, Bookmarks) {
   profile()->CreateBookmarkModel(false);
   profile()->BlockUntilBookmarkModelLoaded();
 
   // Add a bookmark.
   GURL bookmark_url("http://www.google.com/4");
-  bookmark_utils::AddIfNotBookmarked(profile()->GetBookmarkModel(),
-                                     bookmark_url,
-                                     ASCIIToUTF16("bar"));
+  bookmark_utils::AddIfNotBookmarked(
+        BookmarkModelFactory::GetForProfile(profile()),
+        bookmark_url,
+        ASCIIToUTF16("bar"));
 
   // Ask for synchronous. This should only get the bookmark.
   AutocompleteInput sync_input(ASCIIToUTF16("bar"), string16(), true, false,
                                true, AutocompleteInput::SYNCHRONOUS_MATCHES);
   RunQuery(sync_input, false);
   const ACMatches& m1 = matches();
   ASSERT_EQ(1U, m1.size());
   EXPECT_EQ(bookmark_url, m1[0].destination_url);
   EXPECT_EQ(ASCIIToUTF16("bar"), m1[0].description);
   EXPECT_TRUE(m1[0].starred);
@@ skipping 36 matching lines @@
   EXPECT_EQ(0U, matches().size());
 }
 
 // Tests deleting starred results from history, not affecting bookmarks/matches.
 TEST_F(HistoryContentsProviderTest, DeleteStarredMatch) {
   profile()->CreateBookmarkModel(false);
   profile()->BlockUntilBookmarkModelLoaded();
 
   // Bookmark a history item.
   GURL bookmark_url(test_entries[2].url);
-  bookmark_utils::AddIfNotBookmarked(profile()->GetBookmarkModel(),
-                                     bookmark_url,
-                                     ASCIIToUTF16("bar"));
+  bookmark_utils::AddIfNotBookmarked(
+      BookmarkModelFactory::GetForProfile(profile()),
+      bookmark_url,
+      ASCIIToUTF16("bar"));
 
   // Get the match to delete its history
   AutocompleteInput input(ASCIIToUTF16("bar"), string16(), true, false, true,
                           AutocompleteInput::ALL_MATCHES);
   RunQuery(input, false);
   const ACMatches& m = matches();
   ASSERT_EQ(1U, m.size());
 
   // Now delete the match and ensure it was *not* removed.
   provider()->DeleteMatch(m[0]);
   EXPECT_EQ(1U, matches().size());
 
   // Run a query that would only match history (but the history is deleted)
   AutocompleteInput you_input(ASCIIToUTF16("you"), string16(), true, false,
                               true, AutocompleteInput::ALL_MATCHES);
   RunQuery(you_input, false);
   EXPECT_EQ(0U, matches().size());
 
   // Run a query that matches the bookmark
   RunQuery(input, false);
   EXPECT_EQ(1U, matches().size());
 }
 
 }  // namespace