Unpunycode search keywords and short names.

chrome/browser/ui/search_engines/search_engine_tab_helper.cc

Index: chrome/browser/ui/search_engines/search_engine_tab_helper.cc
diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc b/chrome/browser/ui/search_engines/search_engine_tab_helper.cc
index 0ae2d4332403de03702fd446ccdc56eb5d8f225e..085afa16a2b7c27e5f0d0d49a4ba8069ffc9f206 100644
--- a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc
+++ b/chrome/browser/ui/search_engines/search_engine_tab_helper.cc
@@ -4,10 +4,12 @@
 
 #include "chrome/browser/ui/search_engines/search_engine_tab_helper.h"
 
+#include "base/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_fetcher_factory.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h"
+#include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "components/search_engines/template_url.h"
@@ -37,7 +39,8 @@ bool IsFormSubmit(const NavigationEntry* entry) {
 }
 
 base::string16 GenerateKeywordFromNavigationEntry(
-    const NavigationEntry* entry) {
+    const NavigationEntry* entry,
+    const std::string& accept_languages) {
   // Don't autogenerate keywords for pages that are the result of form
   // submissions.
   if (IsFormSubmit(entry))
@@ -61,7 +64,7 @@ base::string16 GenerateKeywordFromNavigationEntry(
   if (!url.SchemeIs(url::kHttpScheme) || (url.path().length() > 1))
     return base::string16();
 
-  return TemplateURL::GenerateKeyword(url);
+  return TemplateURL::GenerateKeyword(url, accept_languages);
 }
 
 void AssociateURLFetcherWithWebContents(content::WebContents* web_contents,
@@ -143,7 +146,8 @@ void SearchEngineTabHelper::OnPageHasOSDD(
   // generate a keyword later after fetching the OSDD.
   base::string16 keyword;
   if (provider_type == TemplateURLFetcher::AUTODETECTED_PROVIDER) {
-    keyword = GenerateKeywordFromNavigationEntry(entry);
+    keyword = GenerateKeywordFromNavigationEntry(
+        entry, profile->GetPrefs()->GetString(prefs::kAcceptLanguages));
     if (keyword.empty())
       return;
   }
@@ -185,7 +189,8 @@ void SearchEngineTabHelper::GenerateKeywordIfNecessary(
     return;
 
   base::string16 keyword(GenerateKeywordFromNavigationEntry(
-      controller.GetEntryAtIndex(last_index - 1)));
+      controller.GetEntryAtIndex(last_index - 1),
+      profile->GetPrefs()->GetString(prefs::kAcceptLanguages)));
   if (keyword.empty())
     return;