Move GenerateSearchURL() and GenerateKeyword() from TemplateURLService to TemplateURL

chrome/browser/webdata/keyword_table.cc

Index: chrome/browser/webdata/keyword_table.cc
diff --git a/chrome/browser/webdata/keyword_table.cc b/chrome/browser/webdata/keyword_table.cc
index 1c207ac4d2922b02a49540e47cc01467bee09959..b98e59b6415601416f5e41e7122173101e01cf4e 100644
--- a/chrome/browser/webdata/keyword_table.cc
+++ b/chrome/browser/webdata/keyword_table.cc
@@ -17,7 +17,6 @@
 #include "base/values.h"
 #include "chrome/browser/history/history_database.h"
 #include "chrome/browser/search_engines/template_url.h"
-#include "chrome/browser/search_engines/template_url_service.h"
 #include "components/search_engines/search_terms_data.h"
 #include "components/webdata/common/web_database.h"
 #include "sql/statement.h"
@@ -612,12 +611,12 @@ bool KeywordTable::MigrateKeywordsTableForVersion45(const std::string& name) {
       // Explicitly generate keywords for all rows with the autogenerate bit set
       // or where the keyword is empty.
       SearchTermsData terms_data;
-      GURL url(TemplateURLService::GenerateSearchURL(&turl, terms_data));
+      GURL url(turl.GenerateSearchURL(terms_data));
       if (!url.is_valid()) {
         delete_entry = true;
       } else {
         // Ensure autogenerated keywords are unique.
-        keyword = TemplateURLService::GenerateKeyword(url);
+        keyword = TemplateURL::GenerateKeyword(url);
         while (keywords.count(keyword))
           keyword.append(base::ASCIIToUTF16("_"));
         sql::Statement u(db_->GetUniqueStatement(