Move GenerateSearchURL() and GenerateKeyword() from TemplateURLService to 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"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #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"
 #include "sql/transaction.h"
 #include "url/gurl.h"
 
 using base::Time;
 
 // static
 const char KeywordTable::kDefaultSearchProviderKey[] =
@@ skipping 574 matching lines @@
     data.SetKeyword(keyword);
     data.SetURL(s.ColumnString(2));
     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::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(
             "UPDATE keywords_temp SET keyword=? WHERE id=?"));
         u.BindString16(0, keyword);
         u.BindInt64(1, s.ColumnInt64(0));
         if (!u.Run())
           return false;
       }
     }
     if (delete_entry) {
       sql::Statement u(db_->GetUniqueStatement(
           "DELETE FROM keywords_temp WHERE id=?"));
       u.BindInt64(0, s.ColumnInt64(0));
       if (!u.Run())
         return false;
     } else {
       keywords.insert(keyword);
     }
   }
 
   // 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());
 }