Removing usage of profile_->GetHistory() from the codebase in order to remove that function.

chrome/browser/predictors/resource_prefetch_predictor.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/predictors/resource_prefetch_predictor.h"
 
 #include <map>
 #include <set>
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util.h"
 #include "base/time.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_notifications.h"
+#include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/history/in_memory_database.h"
 #include "chrome/browser/history/url_database.h"
 #include "chrome/browser/predictors/predictor_database.h"
 #include "chrome/browser/predictors/predictor_database_factory.h"
 #include "chrome/browser/prerender/prerender_field_trial.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 93 matching lines @@
 }
 
 void ResourcePrefetchPredictor::LazilyInitialize() {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   DCHECK_EQ(initialization_state_, NOT_INITIALIZED);
   initialization_state_ = INITIALIZING;
 
   // Request the in-memory database from the history to force it to load so it's
   // available as soon as possible.
-  HistoryService* history_service =
-      profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);
+  HistoryService* history_service = HistoryServiceFactory::GetForProfile(
+      profile_, Profile::EXPLICIT_ACCESS);
   if (history_service)
     history_service->InMemoryDatabase();
 
   // Create local caches using the database as loaded.
   std::vector<UrlTableRow>* url_rows = new std::vector<UrlTableRow>();
   BrowserThread::PostTaskAndReply(
       BrowserThread::DB, FROM_HERE,
       base::Bind(&ResourcePrefetchPredictorTables::GetAllRows,
                  tables_, url_rows),
       base::Bind(&ResourcePrefetchPredictor::CreateCaches, AsWeakPtr(),
@@ skipping 18 matching lines @@
   // TODO(shishir): The following would be much more efficient if we used
   // pointers.
   for (UrlTableCacheMap::iterator it = url_table_cache_.begin();
        it != url_table_cache_.end(); ++it) {
     std::sort(it->second.rows.begin(),
               it->second.rows.end(),
               ResourcePrefetchPredictorTables::UrlTableRowSorter());
   }
 
   // Add notifications for history loading if it is not ready.
-  if (!profile_->GetHistoryService(Profile::EXPLICIT_ACCESS)) {
+  HistoryService* history_service = HistoryServiceFactory::GetForProfile(
+    profile_, Profile::EXPLICIT_ACCESS);
+  if (!history_service) {
     notification_registrar_.Add(this, chrome::NOTIFICATION_HISTORY_LOADED,
                                 content::Source<Profile>(profile_));
   } else {
     OnHistoryAndCacheLoaded();
   }
 }
 
 // static
 bool ResourcePrefetchPredictor::ShouldRecordRequest(
     net::URLRequest* request,
@@ skipping 274 matching lines @@
       NOTREACHED() << "Unexpected notification observed.";
       break;
   }
 }
 
 void ResourcePrefetchPredictor::OnHistoryAndCacheLoaded() {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK_EQ(initialization_state_, INITIALIZING);
 
   // Update the data with last visit info from in memory history db.
-  HistoryService* history_service =
-      profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);
+  HistoryService* history_service = HistoryServiceFactory::GetForProfile(
+      profile_, Profile::EXPLICIT_ACCESS);
   DCHECK(history_service);
   history::URLDatabase* url_db = history_service->InMemoryDatabase();
   if (url_db) {
     std::vector<GURL> urls_to_delete;
     for (UrlTableCacheMap::iterator it = url_table_cache_.begin();
          it != url_table_cache_.end();) {
       history::URLRow url_row;
       if (url_db->GetRowForURL(it->first, &url_row) == 0) {
         urls_to_delete.push_back(it->first);
         url_table_cache_.erase(it++);
@@ skipping 22 matching lines @@
   // TODO(shishir): Maybe listen for notifications for navigation being
   // abandoned and cleanup the inflight_navigations_.
 
   initialization_state_ = INITIALIZED;
 }
 
 bool ResourcePrefetchPredictor::ShouldTrackUrl(const GURL& url) {
   if (url_table_cache_.find(url) != url_table_cache_.end())
     return true;
 
-  HistoryService* history_service =
-      profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);
+  HistoryService* history_service = HistoryServiceFactory::GetForProfile(
+      profile_, Profile::EXPLICIT_ACCESS);
   DCHECK(history_service);
   history::URLDatabase* url_db = history_service->InMemoryDatabase();
   if (!url_db)
     return false;
 
   history::URLRow url_row;
   return url_db->GetRowForURL(url, &url_row) != 0 &&
       url_row.visit_count() >= config_.min_url_visit_count;
 }
 
@@ skipping 236 matching lines @@
                    tables_,
                    urls_to_delete));
 }
 
 void ResourcePrefetchPredictor::SetTablesForTesting(
     scoped_refptr<ResourcePrefetchPredictorTables> tables) {
   tables_ = tables;
 }
 
 }  // namespace predictors