Remove Profile* from 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 40b82434685edf06496c09e1ee3309a24029072f..1c207ac4d2922b02a49540e47cc01467bee09959 100644
--- a/chrome/browser/webdata/keyword_table.cc
+++ b/chrome/browser/webdata/keyword_table.cc
@@ -604,7 +604,7 @@ bool KeywordTable::MigrateKeywordsTableForVersion45(const std::string& name) {
     TemplateURLData data;
     data.SetKeyword(keyword);
     data.SetURL(s.ColumnString(2));
-    TemplateURL turl(NULL, data);
+    TemplateURL turl(data);
     // Don't persist extension keywords to disk.  These will get added to the
     // TemplateURLService as the extensions are loaded.
     bool delete_entry = turl.GetType() == TemplateURL::OMNIBOX_API_EXTENSION;
@@ -612,8 +612,7 @@ 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::GenerateSearchURLUsingTermsData(&turl,
-                                                                   terms_data));
+      GURL url(TemplateURLService::GenerateSearchURL(&turl, terms_data));
       if (!url.is_valid()) {
         delete_entry = true;
       } else {