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

chrome/browser/history/android/android_provider_backend_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/history/android/android_provider_backend.h"
 
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/scoped_temp_dir.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/bookmark_service.h"
 #include "chrome/browser/history/android/android_time.h"
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/ui_test_utils.h"
@@ skipping 98 matching lines @@
     // It seems that the name has to be chrome::kInitialProfile, so it
     // could be found by ProfileManager::GetLastUsedProfile().
     TestingProfile* testing_profile = profile_manager_.CreateTestingProfile(
         chrome::kInitialProfile);
     testing_profile->CreateBookmarkModel(true);
     testing_profile->BlockUntilBookmarkModelLoaded();
     // Get the BookmarkModel from LastUsedProfile, this is the same way that
     // how the BookmarkModelSQLHandler gets the BookmarkModel.
     Profile* profile = ProfileManager::GetLastUsedProfile();
     ASSERT_TRUE(profile);
-    bookmark_model_ = profile->GetBookmarkModel();
+    bookmark_model_ = BookmarkModelFactory::GetForProfile(profile);
     ASSERT_TRUE(bookmark_model_);
 
     // Setup the database directory and files.
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
 
     history_db_name_ = temp_dir_.path().AppendASCII(chrome::kHistoryFilename);
     thumbnail_db_name_ = temp_dir_.path().AppendASCII(
         chrome::kFaviconsFilename);
     android_cache_db_name_ = temp_dir_.path().AppendASCII(
         "TestAndroidCache.db");
@@ skipping 1580 matching lines @@
   // Query by folder=1, the row2 should returned.
   statement.reset(backend->QueryHistoryAndBookmarks(
       projections, std::string("folder=1"), std::vector<string16>(),
       std::string("url ASC")));
   ASSERT_TRUE(statement->statement()->Step());
   EXPECT_EQ(row2.url(), GURL(statement->statement()->ColumnString(0)));
   EXPECT_FALSE(statement->statement()->Step());
 }
 
 }  // namespace history