diff options
| author | caitkp@google.com <caitkp@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-17 00:25:53 +0000 |
|---|---|---|
| committer | caitkp@google.com <caitkp@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-17 00:25:53 +0000 |
| commit | 36726c95287991df8ded1097b659d02b2dcd0fd7 (patch) | |
| tree | d2dca4868d4a775e9855855f194df2f6f878d3d1 /chrome/browser/search_engines/template_url_service.cc | |
| parent | 5efd462dd2e75dbaecd489938859ff2e91550fdd (diff) | |
| download | chromium_src-36726c95287991df8ded1097b659d02b2dcd0fd7.zip chromium_src-36726c95287991df8ded1097b659d02b2dcd0fd7.tar.gz chromium_src-36726c95287991df8ded1097b659d02b2dcd0fd7.tar.bz2 | |
Fix memory leaks in tests caused by not tearing down TemplateUrlService correctly.
These were introduced in https://codereview.chromium.org/13932025/.
R=pkasting@chromium.org
Review URL: https://codereview.chromium.org/14081007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194498 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/search_engines/template_url_service.cc')
| -rw-r--r-- | chrome/browser/search_engines/template_url_service.cc | 4 |
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() { |