Use the DefaultSearchManager as the exclusive authority on DSE, ignoring Web Data.
BUG=365762
[email protected], [email protected], [email protected], [email protected]
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=269396
Review URL: https://codereview.chromium.org/268643002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269725 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/search_engines/util.h b/chrome/browser/search_engines/util.h
index 2b43ce01..994c102 100644
--- a/chrome/browser/search_engines/util.h
+++ b/chrome/browser/search_engines/util.h
@@ -81,21 +81,20 @@
// 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.
+// added to it. |default_search_provider| will be used to prevent removing the
+// current user-selected DSE, regardless of changes in prepopulate data.
void GetSearchProvidersUsingKeywordResult(
const WDTypedResult& result,
WebDataService* service,
Profile* profile,
TemplateURLService::TemplateURLVector* template_urls,
- TemplateURL** default_search_provider,
+ TemplateURL* default_search_provider,
int* new_resource_keyword_version,
std::set<std::string>* removed_keyword_guids);
@@ -110,7 +109,7 @@
WebDataService* service,
Profile* profile,
TemplateURLService::TemplateURLVector* template_urls,
- TemplateURL** default_search_provider,
+ TemplateURL* default_search_provider,
int* resource_keyword_version,
std::set<std::string>* removed_keyword_guids);
