Reland 115318 - Return backup TemplateURL on default search change.

Memleak in WebDataService that caused the revert fixed.

BUG=None
TEST=None

Review URL: http://codereview.chromium.org/9025008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115526 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/search_engines/util.h b/chrome/browser/search_engines/util.h
index 09f001f..c2ba446 100644
--- a/chrome/browser/search_engines/util.h
+++ b/chrome/browser/search_engines/util.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -9,6 +9,7 @@
 // This file contains utility functions for search engine functionality.
 #include <vector>
 
+#include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 
 class PrefService;
@@ -46,7 +47,6 @@
 // lost.
 bool DidDefaultSearchProviderChange(
     const WDTypedResult& result,
-    const std::vector<TemplateURL*>& template_urls,
-    const TemplateURL** backup_default_search_provider);
+    scoped_ptr<TemplateURL>* backup_default_search_provider);
 
 #endif  // CHROME_BROWSER_SEARCH_ENGINES_UTIL_H_