Fix destruction concurrency issue in PrerenderLocalPredictor:

chrome/browser/prerender/prerender_local_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/prerender/prerender_local_predictor.h"
 
 #include "base/timer.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/history/history.h"
@@ skipping 70 matching lines @@
       visit_history_initialized_(false) {
   if (MessageLoop::current()) {
     timer_.Start(FROM_HERE,
                  base::TimeDelta::FromMilliseconds(kInitDelayMs),
                  this,
                  &PrerenderLocalPredictor::Init);
   }
 }
 
 PrerenderLocalPredictor::~PrerenderLocalPredictor() {
-  HistoryService* history = GetHistoryIfExists();
-  if (history)
-    history->RemoveVisitDatabaseObserver(this);
+  if (observing_history_service_.get())
+    observing_history_service_->RemoveVisitDatabaseObserver(this);
 }
 
 void PrerenderLocalPredictor::OnAddVisit(const history::BriefVisitInfo& info) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   HistoryService* history = GetHistoryIfExists();

[cbentzel, 2012/04/24 18:33:57]

Should this be using observing_history_service_?

[tburkard, 2012/04/24 18:39:57]

Makes no difference, since it'd be the same one.  Since it is not critical to
use the same (old) one, I thought it'd be cleaner here to request a fresh copy
from the profile.  Also, if the profile no longer has a historyservice, probably
a good idea to not issue new requests against it if we are already in the
process of shutting down the profile.
On 2012/04/24 18:33:57, cbentzel wrote:

[cbentzel, 2012/04/24 18:47:22]

Sounds reasonable. Can you add a comment about this here?

   if (history) {
     history->ScheduleDBTask(
         new GetURLForURLIDTask(this, info.url_id),
         &history_db_consumer_);
   }
 }
 
 void PrerenderLocalPredictor::OnLookupURL(history::URLID url_id,
                                           const GURL& url) {
 }
@@ skipping 17 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   HistoryService* history = GetHistoryIfExists();
   if (!history) {
     // TODO(tburkard): Record this somewhere (eg histogram) and/or try again
     // later.
     return;
   }
   history->ScheduleDBTask(
       new GetVisitHistoryTask(this, kMaxVisitHistory),
       &history_db_consumer_);
-  history->AddVisitDatabaseObserver(this);
+  observing_history_service_ = history;
+  observing_history_service_->AddVisitDatabaseObserver(this);
 }
 
 }  // namespace prerender