Implement a new IDN display policy

components/omnibox/browser/history_url_provider_unittest.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 "components/omnibox/browser/history_url_provider.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
@@ skipping 124 matching lines @@
   {"http://intra/three", "Intranet three", 2, 2, 80},
   {"http://moo/bar", "Intranet moo", 1, 1, 80},
   {"http://typedhost/typedpath", "Intranet typed", 1, 1, 80},
   {"http://typedhost/untypedpath", "Intranet untyped", 1, 0, 80},
 
   {"http://x.com/one", "Internet", 2, 2, 80},
   {"http://x.com/two", "Internet two", 1, 1, 80},
   {"http://x.com/three", "Internet three", 2, 2, 80},
 
   // For punycode tests.
-  {"http://puny.xn--1lq90ic7f1rc.cn/", "Punycode", 2, 2, 5 },
+  {"http://puny.xn--h2by8byc123p.in/", "Punycode", 2, 2, 5 },
+  {"http://two_puny.xn--1lq90ic7f1rc.cn/",
+    "Punycode to be rendered in Unicode", 2, 2, 5 },
 
   // For experimental HUP scoring test.
   {"http://7.com/1a", "One", 8, 4, 4},
   {"http://7.com/2a", "Two A", 4, 2, 8},
   {"http://7.com/2b", "Two B", 4, 1, 8},
   {"http://7.com/3a", "Three", 2, 1, 16},
   {"http://7.com/4a", "Four A", 1, 1, 32},
   {"http://7.com/4b", "Four B", 1, 1, 64},
   {"http://7.com/5a", "Five A", 8, 0, 64},  // never typed.
 };
@@ skipping 688 matching lines @@
 TEST_F(HistoryURLProviderTest, DoesNotProvideMatchesOnFocus) {
   AutocompleteInput input(
       ASCIIToUTF16("foo"), base::string16::npos, std::string(), GURL(),
       metrics::OmniboxEventProto::INVALID_SPEC, false, false, true, true, true,
       TestSchemeClassifier());
   autocomplete_->Start(input, false);
   EXPECT_TRUE(autocomplete_->matches().empty());
 }
 
 TEST_F(HistoryURLProviderTest, DoesNotInlinePunycodeMatches) {
   // A URL that matches due to a match in the punycode URL are allowed to be the

[Peter Kasting, 2016/03/17 06:01:24]

Nit: are -> is

[jungshik at Google, 2016/03/17 07:43:25]

Done.

-  // default match if the URL doesn't get rendered as international characters
-  // in the given locale.
-  const UrlAndLegalDefault expected_true[] = {
-    { "http://puny.xn--1lq90ic7f1rc.cn/", true },
+  // default match if the URL doesn't get rendered as international characters.
+  const UrlAndLegalDefault expected1_true[] = {
+    { "http://puny.xn--h2by8byc123p.in/", true },
   };
-  UrlAndLegalDefault expected_false[] = {
-    { "http://puny.xn--1lq90ic7f1rc.cn/", false },
+  RunTest(ASCIIToUTF16("pun"), std::string(), false, expected1_true,
+          arraysize(expected1_true));
+  RunTest(ASCIIToUTF16("puny."), std::string(), false, expected1_true,
+          arraysize(expected1_true));
+  RunTest(ASCIIToUTF16("puny.x"), std::string(), false, expected1_true,
+          arraysize(expected1_true));
+  RunTest(ASCIIToUTF16("puny.xn"), std::string(), false, expected1_true,
+          arraysize(expected1_true));
+  RunTest(ASCIIToUTF16("puny.xn--"), std::string(), false, expected1_true,
+          arraysize(expected1_true));
+  RunTest(ASCIIToUTF16("puny.xn--h2"), std::string(), false, expected1_true,
+          arraysize(expected1_true));
+  RunTest(ASCIIToUTF16("puny.xn--h2by8byc123p"), std::string(), false,
+          expected1_true, arraysize(expected1_true));
+  RunTest(ASCIIToUTF16("puny.xn--h2by8byc123p."), std::string(), false,
+          expected1_true, arraysize(expected1_true));
+
+  // When the punycode part of the URL is rendered as international characters,
+  // this match should not be allowed to be the default match if the inline
+  // autocomplete text starts in the middle of the international characters.
+  const UrlAndLegalDefault expected2_true[] = {
+    { "http://two_puny.xn--1lq90ic7f1rc.cn/", true },
   };
-  RunTest(ASCIIToUTF16("pun"), std::string(), false, expected_true,
-          arraysize(expected_true));
-  RunTest(ASCIIToUTF16("puny."), std::string(), false, expected_true,
-          arraysize(expected_true));
-  RunTest(ASCIIToUTF16("puny.x"), std::string(), false, expected_true,
-          arraysize(expected_true));
-  RunTest(ASCIIToUTF16("puny.xn"), std::string(), false, expected_true,
-          arraysize(expected_true));
-  RunTest(ASCIIToUTF16("puny.xn--"), std::string(), false, expected_true,
-          arraysize(expected_true));
-  RunTest(ASCIIToUTF16("puny.xn--1l"), std::string(), false, expected_true,
-          arraysize(expected_true));
-  RunTest(ASCIIToUTF16("puny.xn--1lq90ic7f1rc"), std::string(), false,
-          expected_true, arraysize(expected_true));
-  RunTest(ASCIIToUTF16("puny.xn--1lq90ic7f1rc."), std::string(), false,
-          expected_true, arraysize(expected_true));
-  // Set the language so the punycode part of the URL is rendered as
-  // international characters.  Then this match should not be allowed to be
-  // the default match if the inline autocomplete text starts in the middle
-  // of the international characters.
-  EXPECT_CALL(*client_, GetAcceptLanguages())
-      .WillRepeatedly(testing::Return("zh-CN"));
-  RunTest(ASCIIToUTF16("pun"), std::string(), false, expected_true,
-          arraysize(expected_true));
-  RunTest(ASCIIToUTF16("puny."), std::string(), false, expected_true,
-          arraysize(expected_true));
-  RunTest(ASCIIToUTF16("puny.x"), std::string(), false, expected_false,
-          arraysize(expected_false));
-  RunTest(ASCIIToUTF16("puny.xn"), std::string(), false, expected_false,
-          arraysize(expected_false));
-  RunTest(ASCIIToUTF16("puny.xn--"), std::string(), false, expected_false,
-          arraysize(expected_false));
-  RunTest(ASCIIToUTF16("puny.xn--1l"), std::string(), false, expected_false,
-          arraysize(expected_false));
-  RunTest(ASCIIToUTF16("puny.xn--1lq90ic7f1rc"), std::string(), false,
-          expected_true, arraysize(expected_true));
-  RunTest(ASCIIToUTF16("puny.xn--1lq90ic7f1rc."), std::string(), false,
-          expected_true, arraysize(expected_true));
+  const UrlAndLegalDefault expected2_false[] = {
+    { "http://two_puny.xn--1lq90ic7f1rc.cn/", false },
+  };
+  RunTest(ASCIIToUTF16("two"), std::string(), false, expected2_true,
+          arraysize(expected2_true));
+  RunTest(ASCIIToUTF16("two_puny."), std::string(), false, expected2_true,
+          arraysize(expected2_true));
+  RunTest(ASCIIToUTF16("two_puny.x"), std::string(), false, expected2_false,
+          arraysize(expected2_false));
+  RunTest(ASCIIToUTF16("two_puny.xn"), std::string(), false, expected2_false,
+          arraysize(expected2_false));
+  RunTest(ASCIIToUTF16("two_puny.xn--"), std::string(), false, expected2_false,
+          arraysize(expected2_false));
+  RunTest(ASCIIToUTF16("two_puny.xn--1l"), std::string(), false,
+          expected2_false, arraysize(expected2_false));
+  RunTest(ASCIIToUTF16("two_puny.xn--1lq90ic7f1rc"), std::string(), false,
+          expected2_true, arraysize(expected2_true));
+  RunTest(ASCIIToUTF16("two_puny.xn--1lq90ic7f1rc."), std::string(), false,
+          expected2_true, arraysize(expected2_true));
 }
 
 TEST_F(HistoryURLProviderTest, CullSearchResults) {
   // Set up a default search engine.
   TemplateURLData data;
   data.SetShortName(ASCIIToUTF16("TestEngine"));
   data.SetKeyword(ASCIIToUTF16("TestEngine"));
   data.SetURL("http://testsearch.com/?q={searchTerms}");
   TemplateURLService* template_url_service = client_->GetTemplateURLService();
   TemplateURL* template_url = new TemplateURL(data);
@@ skipping 207 matching lines @@
     // the default experimental scoring.
     autocomplete_->scoring_params_.experimental_scoring_enabled = true;
     ASSERT_NO_FATAL_FAILURE(RunTest(ASCIIToUTF16(test_cases[i].input),
                                     std::string(), false, output, max_matches));
     for (int j = 0; j < max_matches; ++j) {
       EXPECT_EQ(test_cases[i].matches[j].experiment_relevance,
                 matches_[j].relevance);
     }
   }
 }