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

chrome/browser/search_engines/template_url.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_H_
 #define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_H_
 
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 464 matching lines @@
     NORMAL_CONTROLLED_BY_EXTENSION,
     // The keyword associated with an extension that uses the Omnibox API.
     OMNIBOX_API_EXTENSION,
   };
   explicit TemplateURL(const TemplateURLData& data);
   ~TemplateURL();
 
   // Generates a favicon URL from the specified url.
   static GURL GenerateFaviconURL(const GURL& url);
 
+  // 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);

[Peter Kasting, 2014/06/19 17:41:59]

Tiny nit: Given that the keyword member comes before the favicon one, I'd
probably put this function above GenerateFaviconURL().  (I didn't think about
this yesterday or I would have suggested it.)

[hashimoto, 2014/06/19 17:56:05]

Makes sense.
Done.

+
   // Returns true if |t_url| and |data| are equal in all meaningful respects.
   // Static to allow either or both params to be NULL.
   static bool MatchesData(const TemplateURL* t_url,
                           const TemplateURLData* data,
                           const SearchTermsData& search_terms_data);
 
   const TemplateURLData& data() const { return data_; }
 
   const base::string16& short_name() const { return data_.short_name; }
   // An accessor for the short_name, but adjusted so it can be appropriately
@@ skipping 147 matching lines @@
   // |encoded_original_query|. |encoded_terms| may be escaped as path or query
   // depending on |is_in_query|; |encoded_original_query| is always escaped as
   // query.
   void EncodeSearchTerms(
       const TemplateURLRef::SearchTermsArgs& search_terms_args,
       bool is_in_query,
       std::string* input_encoding,
       base::string16* encoded_terms,
       base::string16* encoded_original_query) const;
 
+  // Returns the search url for this template URL.
+  // Returns an empty GURL if this template URL has no url().
+  GURL GenerateSearchURL(const SearchTermsData& search_terms_data) const;
+
  private:
   friend class TemplateURLService;
   FRIEND_TEST_ALL_PREFIXES(TemplateURLTest, ReflectsBookmarkBarPinned);
 
   void CopyFrom(const TemplateURL& other);
 
   void SetURL(const std::string& url);
   void SetPrepopulateId(int id);
 
   // Resets the keyword if IsGoogleSearchURLWithReplaceableKeyword() or |force|.
   // The |force| parameter is useful when the existing keyword is known to be
   // a placeholder.  The resulting keyword is generated using
-  // TemplateURLService::GenerateSearchURL() and
-  // TemplateURLService::GenerateKeyword().
+  // GenerateSearchURL() and GenerateKeyword().
   void ResetKeywordIfNecessary(const SearchTermsData& search_terms_data,
                                bool force);
 
   // Uses the alternate URLs and the search URL to match the provided |url|
   // and extract |search_terms| from it as well as the |search_terms_component|
   // (either REF or QUERY) and |search_terms_component| at which the
   // |search_terms| are found in |url|. See also ExtractSearchTermsFromURL().
   bool FindSearchTermsInURL(const GURL& url,
                             const SearchTermsData& search_terms_data,
                             base::string16* search_terms,
                             url::Parsed::ComponentType* search_terms_component,
                             url::Component* search_terms_position);
 
   TemplateURLData data_;
   TemplateURLRef url_ref_;
   TemplateURLRef suggestions_url_ref_;
   TemplateURLRef instant_url_ref_;
   TemplateURLRef image_url_ref_;
   TemplateURLRef new_tab_url_ref_;
   TemplateURLRef contextual_search_url_ref_;
   scoped_ptr<AssociatedExtensionInfo> extension_info_;
 
   // TODO(sky): Add date last parsed OSD file.
 
   DISALLOW_COPY_AND_ASSIGN(TemplateURL);
 };
 
 #endif  // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_H_