Fix IDNtoUnicode and unittest. ...

net/base/net_util.cc

 // Copyright (c) 2006-2008 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 <algorithm>
 #include <unicode/ucnv.h>
 #include <unicode/uidna.h>
 #include <unicode/ulocdata.h>
 #include <unicode/uniset.h>
 #include <unicode/uscript.h>
@@ skipping 523 matching lines @@
   USet *lang_set = uset_open(1, 0);  // create an empty set
   UnicodeSet ascii_letters(0x61, 0x7a);  // [a-z]
   bool safe = false;
   std::string languages_list(WideToASCII(languages));
   StringTokenizer t(languages_list, ",");
   while (t.GetNext()) {
     std::string lang = t.token();
     status = U_ZERO_ERROR;
     // TODO(jungshik) Cache exemplar sets for locales.
     ULocaleData* uld = ulocdata_open(lang.c_str(), &status);
-    if (U_SUCCESS(status)) {
+    // TODO(jungshik) Turn this check on when the ICU data file is
+    // rebuilt with the minimal subset of locale data for languages
+    // to which Chrome is not localized but which we offer in the list
+    // of languages selectable for Accept-Languages. With the rebuilt ICU
+    // data, ulocdata_open never should fall back to the default locale. (issue 2078)
+    // DCHECK(U_SUCCESS(status) && status != U_USING_DEFAULT_WARNING);
+    if (U_SUCCESS(status) && status != U_USING_DEFAULT_WARNING) {
       // Should we use auxiliary set, instead?
       ulocdata_getExemplarSet(uld, lang_set, 0, ULOCDATA_ES_STANDARD, &status);
       ulocdata_close(uld);
       if (U_SUCCESS(status)) {
         UnicodeSet* allowed_characters =
             reinterpret_cast<UnicodeSet*>(lang_set);
         // If |lang| is compatible with ASCII Latin letters, add them.
         if (IsCompatibleWithASCIILetters(lang))
           allowed_characters->addAll(ascii_letters);
         if (allowed_characters->containsAll(component_characters)) {
@@ skipping 346 matching lines @@
   for (int i = 0; i < array_size; i++) {
     if (kAllowedFtpPorts[i] == port) {
         return true;
     }
   }
   // Port not explicitly allowed by FTP, so return the default restrictions.
   return IsPortAllowedByDefault(port);
 }
 
 }  // namespace net
-