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

chrome/browser/search_engines/search_host_to_urls_map.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/search_host_to_urls_map.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/search_engines/template_url.h"
-#include "chrome/browser/search_engines/template_url_service.h"
 
 SearchHostToURLsMap::SearchHostToURLsMap()
     : initialized_(false) {
 }
 
 SearchHostToURLsMap::~SearchHostToURLsMap() {
 }
 
 void SearchHostToURLsMap::Init(
     const TemplateURLService::TemplateURLVector& template_urls,
     const SearchTermsData& search_terms_data) {
   DCHECK(!initialized_);
   initialized_ = true;  // Set here so Add doesn't assert.
   Add(template_urls, search_terms_data);
 }
 
 void SearchHostToURLsMap::Add(TemplateURL* template_url,
                               const SearchTermsData& search_terms_data) {
   DCHECK(initialized_);
   DCHECK(template_url);
 
-  const GURL url(TemplateURLService::GenerateSearchURL(
-      template_url, search_terms_data));
+  const GURL url(template_url->GenerateSearchURL(search_terms_data));
   if (!url.is_valid() || !url.has_host())
     return;
 
   host_to_urls_map_[url.host()].insert(template_url);
 }
 
 void SearchHostToURLsMap::Remove(TemplateURL* template_url,
                                  const SearchTermsData& search_terms_data) {
   DCHECK(initialized_);
   DCHECK(template_url);
 
-  const GURL url(TemplateURLService::GenerateSearchURL(
-      template_url, search_terms_data));
+  const GURL url(template_url->GenerateSearchURL(search_terms_data));
   if (!url.is_valid() || !url.has_host())
     return;
 
   const std::string host(url.host());
   DCHECK(host_to_urls_map_.find(host) != host_to_urls_map_.end());
 
   TemplateURLSet& urls = host_to_urls_map_[host];
   DCHECK(urls.find(template_url) != urls.end());
 
   urls.erase(urls.find(template_url));
@@ skipping 36 matching lines @@
     if (url_set_iterator != i->second.end()) {
       i->second.erase(url_set_iterator);
       if (i->second.empty())
         host_to_urls_map_.erase(i);
       // A given TemplateURL only occurs once in the map. As soon as we find the
       // entry, stop.
       return;
     }
   }
 }