Loosen RFC 1738 compliance check to allow underscores where we already allowe...

net/base/net_util_unittest.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 "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/escape.h"
@@ skipping 326 matching lines @@
      true}},
   {"xn--fiqs8s.cn", L"\x4e2d\x56fd\x3002" L"cn",
     {false, false, true,  false, false,
      false, false, false, false, false,
      false, false, false, false, false,
      false, false, true,  false, false,
      true}},
 #endif
 };
 
-struct RFC1738Case {
+struct CompliantHostCase {
   const char* host;
   bool expected_output;
 };
 
 struct SuggestedFilenameCase {
   const char* url;
   const char* content_disp_header;
   const char* referrer_charset;
   const char* default_filename;
   const wchar_t* expected_filename;
@@ skipping 450 matching lines @@
                         &output);
       std::wstring expected(idn_cases[i].unicode_allowed[j] ?
                             idn_cases[i].unicode_output :
                             ASCIIToWide(idn_cases[i].input));
       AppendLanguagesToOutputs(kLanguages[j], &expected, &output);
       EXPECT_EQ(expected, output);
     }
   }
 }
 
-TEST(NetUtilTest, RFC1738) {
-  const RFC1738Case rfc1738_cases[] = {
+TEST(NetUtilTest, CompliantHost) {
+  const CompliantHostCase compliant_host_cases[] = {
     {"", false},
     {"a", true},
     {"-", false},
     {".", false},
     {"a.", false},
     {"a.a", true},
     {"9.a", true},
     {"a.9", false},
+    {"_9a", false},
     {"a.a9", true},
     {"a.9a", false},
     {"a+9a", false},
     {"1-.a-b", false},
-    {"1-2.a-b", true},
+    {"1-2.a_b", true},
     {"a.b.c.d.e", true},
     {"1.2.3.4.e", true},
     {"a.b.c.d.5", false},
   };
 
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(rfc1738_cases); ++i) {
-    EXPECT_EQ(rfc1738_cases[i].expected_output,
-              net::IsCanonicalizedHostRFC1738Compliant(rfc1738_cases[i].host));
+  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(compliant_host_cases); ++i) {
+    EXPECT_EQ(compliant_host_cases[i].expected_output,
+              net::IsCanonicalizedHostCompliant(compliant_host_cases[i].host));
   }
 }
 
 TEST(NetUtilTest, StripWWW) {
   EXPECT_EQ(L"", net::StripWWW(L""));
   EXPECT_EQ(L"", net::StripWWW(L"www."));
   EXPECT_EQ(L"blah", net::StripWWW(L"www.blah"));
   EXPECT_EQ(L"blah", net::StripWWW(L"blah"));
 }
 
@@ skipping 588 matching lines @@
     net::SetExplicitlyAllowedPorts(invalid[i]);
     EXPECT_EQ(0, static_cast<int>(net::explicitly_allowed_ports.size()));
   }
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(valid); ++i) {
     net::SetExplicitlyAllowedPorts(valid[i]);
     EXPECT_EQ(i, net::explicitly_allowed_ports.size());
   }
 }