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

chrome/browser/search_engines/template_url_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_
 #define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_
 
 #include <list>
 #include <map>
 #include <set>
@@ skipping 95 matching lines @@
   // SaveDefaultSearchProviderToPrefs or set via policy.
   // Returns true if successful, false otherwise.
   // If the user or the policy has opted for no default search, this
   // returns true but default_provider is set to NULL.
   // |*is_managed| specifies whether the default is managed via policy.
   static bool LoadDefaultSearchProviderFromPrefs(
       PrefService* prefs,
       scoped_ptr<TemplateURLData>* default_provider_data,
       bool* is_managed);
 
-  // Generates a suitable keyword for the specified url, which must be valid.
-  // This is guaranteed not to return an empty string, since TemplateURLs should
-  // never have an empty keyword.
-  static base::string16 GenerateKeyword(const GURL& url);
-
   // Removes any unnecessary characters from a user input keyword.
   // This removes the leading scheme, "www." and any trailing slash.
   static base::string16 CleanUserInputKeyword(const base::string16& keyword);
 
-  // Returns the search url for t_url.  Returns an empty GURL if t_url has no
-  // url().
-  static GURL GenerateSearchURL(const TemplateURL* t_url,
-                                const SearchTermsData& search_terms_data);
-
   // Saves enough of url to |prefs| so that it can be loaded from preferences on
   // start up.
   static void SaveDefaultSearchProviderToPrefs(const TemplateURL* url,
                                                PrefService* prefs);
 
   // Returns true if there is no TemplateURL that conflicts with the
   // keyword/url pair, or there is one but it can be replaced. If there is an
   // existing keyword that can be replaced and template_url_to_replace is
   // non-NULL, template_url_to_replace is set to the keyword to replace.
   //
@@ skipping 631 matching lines @@
 
   // Helper class to manage the default search engine.
   DefaultSearchManager default_search_manager_;
 
   scoped_ptr<GoogleURLTracker::Subscription> google_url_updated_subscription_;
 
   DISALLOW_COPY_AND_ASSIGN(TemplateURLService);
 };
 
 #endif  // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_