Remove last references to profile->GetHistory() and profile->GetBookmarkModel()

chrome/test/base/testing_profile.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/test/base/testing_profile.h"
 
 #include "build/build_config.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
@@ skipping 402 matching lines @@
     web_data_service->Init(profile->GetPath());
   return web_data_service;
 }
 
 void TestingProfile::CreateWebDataService() {
   WebDataServiceFactory::GetInstance()->SetTestingFactory(
       this, BuildWebDataService);
 }
 
 void TestingProfile::BlockUntilBookmarkModelLoaded() {
-  DCHECK(GetBookmarkModel());
-  if (GetBookmarkModel()->IsLoaded())
+  // Only get the bookmark model if it actually exists since the caller of the
+  // test should explicitly call CreateBookmarkModel to build it.
+  BookmarkModel* bookmark_model =
+      BookmarkModelFactory::GetForProfileIfExists(this);
+  DCHECK(bookmark_model);
+  if (bookmark_model->IsLoaded())
     return;
   base::RunLoop run_loop;
   BookmarkLoadObserver observer(content::GetQuitTaskForRunLoop(&run_loop));
-  GetBookmarkModel()->AddObserver(&observer);
+  bookmark_model->AddObserver(&observer);
   run_loop.Run();
-  GetBookmarkModel()->RemoveObserver(&observer);
-  DCHECK(GetBookmarkModel()->IsLoaded());
+  bookmark_model->RemoveObserver(&observer);
+  DCHECK(bookmark_model->IsLoaded());
 }
 
 // TODO(phajdan.jr): Doesn't this hang if Top Sites are already loaded?
 void TestingProfile::BlockUntilTopSitesLoaded() {
   content::WindowedNotificationObserver top_sites_loaded_observer(
       chrome::NOTIFICATION_TOP_SITES_LOADED,
       content::NotificationService::AllSources());
-  if (!GetHistoryService(Profile::EXPLICIT_ACCESS))
+  if (!HistoryServiceFactory::GetForProfile(this, Profile::EXPLICIT_ACCESS))
     GetTopSites()->HistoryLoaded();
   top_sites_loaded_observer.Wait();
 }
 
 FilePath TestingProfile::GetPath() {
   return profile_path_;
 }
 
 TestingPrefService* TestingProfile::GetTestingPrefService() {
   if (!prefs_.get())
@@ skipping 63 matching lines @@
 TestingProfile::GetExtensionSpecialStoragePolicy() {
   if (!extension_special_storage_policy_.get())
     extension_special_storage_policy_ = new ExtensionSpecialStoragePolicy(NULL);
   return extension_special_storage_policy_.get();
 }
 
 FaviconService* TestingProfile::GetFaviconService(ServiceAccessType access) {
   return favicon_service_.get();
 }
 
-HistoryService* TestingProfile::GetHistoryService(ServiceAccessType access) {
-  return HistoryServiceFactory::GetForProfileIfExists(this, access);
-}
-
-HistoryService* TestingProfile::GetHistoryServiceWithoutCreating() {
-  return HistoryServiceFactory::GetForProfileWithoutCreating(this);
-}
-
 net::CookieMonster* TestingProfile::GetCookieMonster() {
   if (!GetRequestContext())
     return NULL;
   return GetRequestContext()->GetURLRequestContext()->cookie_store()->
       GetCookieMonster();
 }
 
 policy::UserCloudPolicyManager* TestingProfile::GetUserCloudPolicyManager() {
   return user_cloud_policy_manager_.get();
 }
@@ skipping 158 matching lines @@
 }
 
 void TestingProfile::SetID(const std::wstring& id) {
   id_ = id;
 }
 
 bool TestingProfile::DidLastSessionExitCleanly() {
   return last_session_exited_cleanly_;
 }
 
-BookmarkModel* TestingProfile::GetBookmarkModel() {
-  return BookmarkModelFactory::GetForProfileIfExists(this);
-}
-
 bool TestingProfile::IsSameProfile(Profile *p) {
   return this == p;
 }
 
 base::Time TestingProfile::GetStartTime() const {
   return start_time_;
 }
 
 ProtocolHandlerRegistry* TestingProfile::GetProtocolHandlerRegistry() {
   return NULL;
@@ skipping 90 matching lines @@
   build_called_ = true;
   return scoped_ptr<TestingProfile>(new TestingProfile(
       path_,
       delegate_,
       extension_policy_,
       pref_service_.Pass(),
       user_cloud_policy_manager_.Pass()));
 }