summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/search_engines/template_url_service.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/search_engines/template_url_service.cc b/chrome/browser/search_engines/template_url_service.cc
index 1472068..63cf81f 100644
--- a/chrome/browser/search_engines/template_url_service.cc
+++ b/chrome/browser/search_engines/template_url_service.cc
@@ -306,6 +306,9 @@ TemplateURLService::TemplateURLService(const Initializer* initializers,
}
TemplateURLService::~TemplateURLService() {
+ if (service_)
+ Shutdown();
+ STLDeleteElements(&template_urls_);
}
// static
@@ -881,7 +884,6 @@ void TemplateURLService::Shutdown() {
service_->CancelRequest(load_handle_);
}
service_ = NULL;
- STLDeleteElements(&template_urls_);
}
void TemplateURLService::OnSyncedDefaultSearchProviderGUIDChanged() {