Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(558)

Unified Diff: chrome/browser/search_engines/template_url_service.cc

Issue 13932025: Cancel pending requests for TemplateURLs in Shutdown, instead of dtor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/search_engines/template_url_service.cc
diff --git a/chrome/browser/search_engines/template_url_service.cc b/chrome/browser/search_engines/template_url_service.cc
index 912f9b1078b754b9746399600ef56171f7066e4d..8af4bf41987be63236c4c422db1ed1c0c56ddfde 100644
--- a/chrome/browser/search_engines/template_url_service.cc
+++ b/chrome/browser/search_engines/template_url_service.cc
@@ -306,11 +306,14 @@ TemplateURLService::TemplateURLService(const Initializer* initializers,
}
TemplateURLService::~TemplateURLService() {
+}
+
+void TemplateURLService::Shutdown() {
if (load_handle_) {
Peter Kasting 2013/04/12 22:32:17 Add a comment about why it's important to do this
DCHECK(service_.get());
service_->CancelRequest(load_handle_);
}
-
+ service_ = NULL;
STLDeleteElements(&template_urls_);
}

Powered by Google App Engine
This is Rietveld 408576698