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 834 matching lines @@
   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
-  // default match if the URL doesn't get rendered as international characters
-  // in the given locale.
+  // default match if the URL doesn't get rendered as international characters.
+  // 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 expected_true[] = {
     { "http://puny.xn--1lq90ic7f1rc.cn/", true },
   };
   UrlAndLegalDefault expected_false[] = {
     { "http://puny.xn--1lq90ic7f1rc.cn/", false },
   };
   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));
@@ skipping 219 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);
     }
   }
 }