| Index: chrome/browser/prerender/prerender_local_predictor.cc
|
| diff --git a/chrome/browser/prerender/prerender_local_predictor.cc b/chrome/browser/prerender/prerender_local_predictor.cc
|
| index ecc68e550a29bc1ae701ff596f3bd66c41c5d4b0..20208cc2d7a94e5bf3d1c5ed953c15b9eb24a6d5 100644
|
| --- a/chrome/browser/prerender/prerender_local_predictor.cc
|
| +++ b/chrome/browser/prerender/prerender_local_predictor.cc
|
| @@ -528,7 +528,7 @@ class PrerenderLocalPredictor::PrefetchList {
|
| PrerenderLocalPredictor::PrerenderLocalPredictor(
|
| PrerenderManager* prerender_manager)
|
| : prerender_manager_(prerender_manager),
|
| - is_visit_database_observer_(false),
|
| + is_history_service_observer_(false),
|
| weak_factory_(this),
|
| prefetch_list_(new PrefetchList()) {
|
| RecordEvent(EVENT_CONSTRUCTED);
|
| @@ -583,11 +583,11 @@ PrerenderLocalPredictor::~PrerenderLocalPredictor() {
|
|
|
| void PrerenderLocalPredictor::Shutdown() {
|
| timer_.Stop();
|
| - if (is_visit_database_observer_) {
|
| + if (is_history_service_observer_) {
|
| HistoryService* history = GetHistoryIfExists();
|
| CHECK(history);
|
| - history->RemoveVisitDatabaseObserver(this);
|
| - is_visit_database_observer_ = false;
|
| + history->RemoveObserver(this);
|
| + is_history_service_observer_ = false;
|
| }
|
| }
|
|
|
| @@ -1138,13 +1138,13 @@ void PrerenderLocalPredictor::Init() {
|
| }
|
| HistoryService* history = GetHistoryIfExists();
|
| if (history) {
|
| - CHECK(!is_visit_database_observer_);
|
| + CHECK(!is_history_service_observer_);
|
| history->ScheduleDBTask(
|
| scoped_ptr<history::HistoryDBTask>(
|
| new GetVisitHistoryTask(this, kMaxVisitHistory)),
|
| &history_db_tracker_);
|
| - history->AddVisitDatabaseObserver(this);
|
| - is_visit_database_observer_ = true;
|
| + history->AddObserver(this);
|
| + is_history_service_observer_ = true;
|
| } else {
|
| RecordEvent(EVENT_INIT_FAILED_NO_HISTORY);
|
| }
|
|
|