Remove Profile* from TemplateURL

chrome/browser/webdata/keyword_table.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/webdata/keyword_table.h"
 
 #include <set>
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 586 matching lines @@
   base::string16 placeholder_keyword(base::ASCIIToUTF16("dummy"));
   std::set<base::string16> keywords;
   while (s.Step()) {
     base::string16 keyword(s.ColumnString16(1));
     bool generate_keyword = keyword.empty() || s.ColumnBool(3);
     if (generate_keyword)
       keyword = placeholder_keyword;
     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;
     if (!delete_entry && generate_keyword) {
       // 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 {
         // Ensure autogenerated keywords are unique.
         keyword = TemplateURLService::GenerateKeyword(url);
         while (keywords.count(keyword))
           keyword.append(base::ASCIIToUTF16("_"));
         sql::Statement u(db_->GetUniqueStatement(
             "UPDATE keywords_temp SET keyword=? WHERE id=?"));
         u.BindString16(0, keyword);
@@ skipping 13 matching lines @@
     }
   }
 
   // Replace the old table with the new one.
   sql = "DROP TABLE " + name;
   if (!db_->Execute(sql.c_str()))
     return false;
   sql = "ALTER TABLE keywords_temp RENAME TO " + name;
   return db_->Execute(sql.c_str());
 }