Unpunycode search keywords and short names.

components/search_engines/template_url.h

Index: components/search_engines/template_url.h
diff --git a/components/search_engines/template_url.h b/components/search_engines/template_url.h
index 73006be66b632856b86a2d79d5b8f5f5d9115883..20919cf7fbf2ce40ebea81ce541ec19706d90c7e 100644
--- a/components/search_engines/template_url.h
+++ b/components/search_engines/template_url.h
@@ -523,7 +523,10 @@ class TemplateURL {
   // 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);
+  // |accept_languages| is a list of languages, which will be used in
+  // IDN-decoding of |url|'s hostname.
+  static base::string16 GenerateKeyword(const GURL& url,
+                                        const std::string& accept_languages);
 
   // Generates a favicon URL from the specified url.
   static GURL GenerateFaviconURL(const GURL& url);