Implemented 'Reset Search engines' feature.

chrome/browser/search_engines/util.h

Index: chrome/browser/search_engines/util.h
diff --git a/chrome/browser/search_engines/util.h b/chrome/browser/search_engines/util.h
index 432569f363a2cd3f3485d1df4a2019264afdc41d..088ef60ef4d6ee9e7b62b59ed7e846fbf156e52c 100644
--- a/chrome/browser/search_engines/util.h
+++ b/chrome/browser/search_engines/util.h
@@ -50,6 +50,29 @@ void GetSearchProvidersUsingKeywordResult(
     int* new_resource_keyword_version,
     std::set<std::string>* removed_keyword_guids);
 
+// Processes the |*template_urls|, combining it with
+// prepopulated search providers to result in:
+//  * a set of template_urls (search providers). The caller owns the
+//    TemplateURL* returned in template_urls.
+//  * the default search provider (and if *default_search_provider is not NULL,
+//    it is contained in template_urls).
+//  * whether there is a new resource keyword version (and the value).
+//    |*new_resource_keyword_version| is set to 0 if no new value. Otherwise,
+//    it is the new value.
+// Only pass in a non-NULL value for service if the WebDataService should be
+// updated. If |removed_keyword_guids| is not NULL, any TemplateURLs removed
+// from the keyword table in the WebDataService will have their Sync GUIDs
+// added to it.
+// |*new_resource_keyword_version| should contain current version of
+// |*template_urls|.

[Peter Kasting, 2013/05/22 21:22:57]

This comment is confusing.  How about just this:

Like GetSearchProvidersUsingKeywordResult(), but allows the caller to pass in
engines in |template_urls| instead of getting them via processing a web data
service request.

[vasilii, 2013/05/23 17:03:42]

Done.

+void GetSearchProvidersUsingLoadedEngines(
+    WebDataService* service,
+    Profile* profile,
+    TemplateURLService::TemplateURLVector* template_urls,
+    TemplateURL** default_search_provider,
+    int* new_resource_keyword_version,
+    std::set<std::string>* removed_keyword_guids);
+
 // Due to a bug, the |input_encodings| field of TemplateURLData could have
 // contained duplicate entries.  This removes those entries and returns whether
 // any were found.