Index: chrome/browser/browsing_data/browsing_data_remover.cc |
diff --git a/chrome/browser/browsing_data/browsing_data_remover.cc b/chrome/browser/browsing_data/browsing_data_remover.cc |
index da2bb2f5c84dc5b49353b26421ec3a47ccc3dcc6..6c9b999d90a6ae42acc2f2a118edd35caeedca91 100644 |
--- a/chrome/browser/browsing_data/browsing_data_remover.cc |
+++ b/chrome/browser/browsing_data/browsing_data_remover.cc |
@@ -312,7 +312,8 @@ void BrowsingDataRemover::RemoveImpl(int remove_mask, |
BrowserThread::PostTask( |
BrowserThread::IO, FROM_HERE, |
base::Bind(&BrowsingDataRemover::ClearNetworkPredictorOnIOThread, |
- base::Unretained(this))); |
+ base::Unretained(this), |
+ profile_->GetNetworkPredictor())); |
} |
// As part of history deletion we also delete the auto-generated keywords. |
@@ -864,14 +865,12 @@ void BrowsingDataRemover::OnClearedNetworkPredictor() { |
NotifyAndDeleteIfDone(); |
} |
-void BrowsingDataRemover::ClearNetworkPredictorOnIOThread() { |
+void BrowsingDataRemover::ClearNetworkPredictorOnIOThread( |
+ chrome_browser_net::Predictor* predictor) { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
- chrome_browser_net::Predictor* predictor = profile_->GetNetworkPredictor(); |
- if (predictor) { |
Mike West
2014/06/10 12:33:13
Can this be null? If not, can we DCHECK?
engedy
2014/06/10 15:19:40
Indeed, this must be non-NULL, otherwise the metho
|
- predictor->DiscardInitialNavigationHistory(); |
- predictor->DiscardAllResults(); |
- } |
+ predictor->DiscardInitialNavigationHistory(); |
+ predictor->DiscardAllResults(); |
// Notify the UI thread that we are done. |
BrowserThread::PostTask( |