Split keyword related parts of WebDataService as KeywordWebDataService

chrome/browser/search_engines/util.cc

Index: chrome/browser/search_engines/util.cc
diff --git a/chrome/browser/search_engines/util.cc b/chrome/browser/search_engines/util.cc
index 2117e7ea66d3992a0c2cd6a042e1353f4c9f82fb..9e6c7440e0399639a32c0c328476a4b6b3f692b9 100644
--- a/chrome/browser/search_engines/util.cc
+++ b/chrome/browser/search_engines/util.cc
@@ -45,7 +45,7 @@ GURL GetDefaultSearchURLForSearchTerms(TemplateURLService* service,
 }
 
 void RemoveDuplicatePrepopulateIDs(
-    WebDataService* service,
+    KeywordWebDataService* service,
     const ScopedVector<TemplateURLData>& prepopulated_urls,
     TemplateURL* default_search_provider,
     TemplateURLService::TemplateURLVector* template_urls,
@@ -186,7 +186,7 @@ ActionsFromPrepopulateData::~ActionsFromPrepopulateData() {}
 // from the DB will be added to it.  Note that this function will take
 // ownership of |prepopulated_urls| and will clear the vector.
 void MergeEnginesFromPrepopulateData(
-    WebDataService* service,
+    KeywordWebDataService* service,
     ScopedVector<TemplateURLData>* prepopulated_urls,
     size_t default_search_index,
     TemplateURLService::TemplateURLVector* template_urls,
@@ -307,7 +307,7 @@ ActionsFromPrepopulateData CreateActionsFromCurrentPrepopulateData(
 
 void GetSearchProvidersUsingKeywordResult(
     const WDTypedResult& result,
-    WebDataService* service,
+    KeywordWebDataService* service,
     PrefService* prefs,
     TemplateURLService::TemplateURLVector* template_urls,
     TemplateURL* default_search_provider,
@@ -347,7 +347,7 @@ void GetSearchProvidersUsingKeywordResult(
 }
 
 void GetSearchProvidersUsingLoadedEngines(
-    WebDataService* service,
+    KeywordWebDataService* service,
     PrefService* prefs,
     TemplateURLService::TemplateURLVector* template_urls,
     TemplateURL* default_search_provider,