Unpunycode search keywords and short names.

components/search_engines/template_url_unittest.cc

 // Copyright 2014 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 "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/metrics/proto/omnibox_event.pb.h"
@@ skipping 1676 matching lines @@
                 "ctxs_end=11&"
                 "q=allen&"
                 "ctxs_content=woody+allen+movies&"
                 "ctxsl_url=www.wikipedia.org&"
                 "ctxs_encoding=utf-8&"
                 "ctxsl_resolve=1",
             result);
 }
 
 TEST_F(TemplateURLTest, GenerateKeyword) {
+  std::string accept_languages = "en,ru";
   ASSERT_EQ(ASCIIToUTF16("foo"),
-            TemplateURL::GenerateKeyword(GURL("http://foo")));
+            TemplateURL::GenerateKeyword(GURL("http://foo"), accept_languages));
   // www. should be stripped.
-  ASSERT_EQ(ASCIIToUTF16("foo"),
-            TemplateURL::GenerateKeyword(GURL("http://www.foo")));
+  ASSERT_EQ(ASCIIToUTF16("foo"), TemplateURL::GenerateKeyword(
+                                     GURL("http://www.foo"), accept_languages));
   // Make sure we don't get a trailing '/'.
-  ASSERT_EQ(ASCIIToUTF16("blah"),
-            TemplateURL::GenerateKeyword(GURL("http://blah/")));
+  ASSERT_EQ(ASCIIToUTF16("blah"), TemplateURL::GenerateKeyword(
+                                      GURL("http://blah/"), accept_languages));
   // Don't generate the empty string.
-  ASSERT_EQ(ASCIIToUTF16("www"),
-            TemplateURL::GenerateKeyword(GURL("http://www.")));
+  ASSERT_EQ(ASCIIToUTF16("www"), TemplateURL::GenerateKeyword(
+                                     GURL("http://www."), accept_languages));
+  ASSERT_EQ(
+      base::UTF8ToUTF16("\xd0\xb0\xd0\xb1\xd0\xb2"),
+      TemplateURL::GenerateKeyword(GURL("http://xn--80acd"), accept_languages));
 }
 
 TEST_F(TemplateURLTest, GenerateSearchURL) {
   struct GenerateSearchURLCase {
     const char* test_name;
     const char* url;
     const char* expected;
   } generate_url_cases[] = {
     { "invalid URL", "foo{searchTerms}", "" },
     { "URL with no replacements", "http://foo/", "http://foo/" },
@@ skipping 25 matching lines @@
   EXPECT_EQ("http://bar/search?q=foo&pfq=full%20query%20text&qha=2338&xssi=t",
             result);
 
   TemplateURL url2(data);
   search_terms_args.prefetch_query.clear();
   search_terms_args.prefetch_query_type.clear();
   result =
       url2.url_ref().ReplaceSearchTerms(search_terms_args, search_terms_data_);
   EXPECT_EQ("http://bar/search?q=foo&xssi=t", result);
 }