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

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() {