Fix memory leaks in tests caused by not tearing down TemplateUrlService correctly.

chrome/browser/search_engines/template_url_service.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/search_engines/template_url_service.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/environment.h"
@@ skipping 288 matching lines @@
       next_id_(kInvalidTemplateURLID + 1),
       time_provider_(&base::Time::Now),
       models_associated_(false),
       processing_syncer_changes_(false),
       pending_synced_default_search_(false),
       dsp_change_origin_(DSP_CHANGE_NOT_SYNC) {
   Init(initializers, count);
 }
 
 TemplateURLService::~TemplateURLService() {
+  if (service_)
+    Shutdown();
+  STLDeleteElements(&template_urls_);
 }
 
 // static
 string16 TemplateURLService::GenerateKeyword(const GURL& url) {
   DCHECK(url.is_valid());
   // Strip "www." off the front of the keyword; otherwise the keyword won't work
   // properly.  See http://code.google.com/p/chromium/issues/detail?id=6984 .
   // Special case: if the host was exactly "www." (not sure this can happen but
   // perhaps with some weird intranet and custom DNS server?), ensure we at
   // least don't return the empty string.
@@ skipping 555 matching lines @@
 
 void TemplateURLService::Shutdown() {
   // This check has to be done at Shutdown() instead of in the dtor to ensure
   // that no clients of WebDataService are holding ptrs to it after the first
   // phase of the ProfileKeyedService Shutdown() process.
   if (load_handle_) {
     DCHECK(service_.get());
     service_->CancelRequest(load_handle_);
   }
   service_ = NULL;
-  STLDeleteElements(&template_urls_);
 }
 
 void TemplateURLService::OnSyncedDefaultSearchProviderGUIDChanged() {
   // Listen for changes to the default search from Sync.
   PrefService* prefs = GetPrefs();
   TemplateURL* new_default_search = GetTemplateURLForGUID(
       prefs->GetString(prefs::kSyncedDefaultSearchProviderGUID));
   if (new_default_search && !is_default_search_managed_) {
     if (new_default_search != GetDefaultSearchProvider()) {
       base::AutoReset<DefaultSearchChangeOrigin> change_origin(
@@ skipping 1593 matching lines @@
     // TODO(mpcomplete): If we allow editing extension keywords, then those
     // should be persisted to disk and synced.
     if (template_url->sync_guid().empty() &&
         !template_url->IsExtensionKeyword()) {
       template_url->data_.sync_guid = base::GenerateGUID();
       if (service_.get())
         service_->UpdateKeyword(template_url->data());
     }
   }
 }