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

chrome/browser/search_engines/template_url_service.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/search_engines/template_url_service.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/auto_reset.h"
@@ skipping 359 matching lines @@
   }
   if (!prepopulate_id.empty() && !*is_managed) {
     int value;
     base::StringToInt(prepopulate_id, &value);
     (*default_provider_data)->prepopulate_id = value;
   }
   return true;
 }
 
 // static
-base::string16 TemplateURLService::GenerateKeyword(const GURL& url) {
-  DCHECK(url.is_valid());
-  // Strip "www." off the front of the keyword; otherwise the keyword won't work
-  // properly.  See http://code.google.com/p/chromium/issues/detail?id=6984 .
-  // Special case: if the host was exactly "www." (not sure this can happen but
-  // perhaps with some weird intranet and custom DNS server?), ensure we at
-  // least don't return the empty string.
-  base::string16 keyword(net::StripWWWFromHost(url));
-  return keyword.empty() ? base::ASCIIToUTF16("www") : keyword;
-}
-
-// static
 base::string16 TemplateURLService::CleanUserInputKeyword(
     const base::string16& keyword) {
   // Remove the scheme.
   base::string16 result(base::i18n::ToLower(keyword));
   base::TrimWhitespace(result, base::TRIM_ALL, &result);
   url::Component scheme_component;
   if (url::ExtractScheme(base::UTF16ToUTF8(keyword).c_str(),
                          static_cast<int>(keyword.length()),
                          &scheme_component)) {
     // If the scheme isn't "http" or "https", bail.  The user isn't trying to
@@ skipping 15 matching lines @@
 
   // Remove leading "www.".
   result = net::StripWWW(result);
 
   // Remove trailing "/".
   return (result.length() > 0 && result[result.length() - 1] == '/') ?
       result.substr(0, result.length() - 1) : result;
 }
 
 // static
-GURL TemplateURLService::GenerateSearchURL(
-    const TemplateURL* t_url,
-    const SearchTermsData& search_terms_data) {
-  DCHECK(t_url);
-
-  const TemplateURLRef& search_ref = t_url->url_ref();
-  if (!search_ref.IsValid(search_terms_data))
-    return GURL();
-
-  if (!search_ref.SupportsReplacement(search_terms_data))
-    return GURL(t_url->url());
-
-  // Use something obscure for the search terms argument so that in the rare
-  // case the term replaces the URL it's unlikely another keyword would have the
-  // same url.
-  // TODO(jnd): Add additional parameters to get post data when the search URL
-  // has post parameters.
-  return GURL(search_ref.ReplaceSearchTerms(
-      TemplateURLRef::SearchTermsArgs(
-          base::ASCIIToUTF16("blah.blah.blah.blah.blah")),
-      search_terms_data, NULL));
-}
-
-// static
 void TemplateURLService::SaveDefaultSearchProviderToPrefs(
     const TemplateURL* t_url,
     PrefService* prefs) {
   if (!prefs)
     return;
 
   bool enabled = false;
   std::string search_url;
   std::string suggest_url;
   std::string instant_url;
@@ skipping 140 matching lines @@
       initial_default_search_provider_.get() : NULL;
 }
 
 TemplateURL* TemplateURLService::GetTemplateURLForHost(
     const std::string& host) {
   if (loaded_)
     return provider_map_->GetTemplateURLForHost(host);
   TemplateURL* initial_dsp = initial_default_search_provider_.get();
   if (!initial_dsp)
     return NULL;
-  return (GenerateSearchURL(initial_dsp, search_terms_data()).host() == host) ?
+  return (initial_dsp->GenerateSearchURL(search_terms_data()).host() == host) ?
       initial_dsp : NULL;
 }
 
 bool TemplateURLService::Add(TemplateURL* template_url) {
   WebDataService::KeywordBatchModeScoper keyword_scoper(service_.get());
   if (!AddNoNotify(template_url, true))
     return false;
   NotifyObservers();
   return true;
 }
@@ skipping 69 matching lines @@
     base::Time created_before) {
   GURL o(origin.GetOrigin());
   bool should_notify = false;
   WebDataService::KeywordBatchModeScoper keyword_scoper(service_.get());
   for (size_t i = 0; i < template_urls_.size();) {
     if (template_urls_[i]->date_created() >= created_after &&
         (created_before.is_null() ||
          template_urls_[i]->date_created() < created_before) &&
         CanReplace(template_urls_[i]) &&
         (o.is_empty() ||
-         GenerateSearchURL(template_urls_[i],
-                           search_terms_data()).GetOrigin() == o)) {
+         template_urls_[i]->GenerateSearchURL(
+             search_terms_data()).GetOrigin() == o)) {
       RemoveNoNotify(template_urls_[i]);
       should_notify = true;
     } else {
       ++i;
     }
   }
   if (should_notify)
     NotifyObservers();
 }
 
@@ skipping 1554 matching lines @@
   if (!force) {
     // Already unique.
     if (!GetTemplateURLForKeyword(turl.keyword()))
       return turl.keyword();
 
     // First, try to return the generated keyword for the TemplateURL (except
     // for extensions, as their keywords are not associated with their URLs).
     GURL gurl(turl.url());
     if (gurl.is_valid() &&
         (turl.GetType() != TemplateURL::OMNIBOX_API_EXTENSION)) {
-      base::string16 keyword_candidate = GenerateKeyword(gurl);
+      base::string16 keyword_candidate = TemplateURL::GenerateKeyword(gurl);
       if (!GetTemplateURLForKeyword(keyword_candidate))
         return keyword_candidate;
     }
   }
 
   // We try to uniquify the keyword by appending a special character to the end.
   // This is a best-effort approach where we try to preserve the original
   // keyword and let the user do what they will after our attempt.
   base::string16 keyword_candidate(turl.keyword());
   do {
@@ skipping 222 matching lines @@
 
   if (most_recently_intalled_default) {
     base::AutoReset<DefaultSearchChangeOrigin> change_origin(
         &dsp_change_origin_, DSP_CHANGE_OVERRIDE_SETTINGS_EXTENSION);
     default_search_manager_.SetExtensionControlledDefaultSearchEngine(
         most_recently_intalled_default->data());
   } else {
     default_search_manager_.ClearExtensionControlledDefaultSearchEngine();
   }
 }