Change ParseHostAndPort() to not include brackets around IPv6 literals.

net/base/net_util_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 "net/base/net_util.h"
 
 #include <string.h>
 
 #include <ostream>
 
@@ skipping 228 matching lines @@
     bool success;
     const char* expected_host;
     int expected_port;
   } tests[] = {
     // Valid inputs:
     {"foo:10", true, "foo", 10},
     {"foo", true, "foo", -1},
     {
       "[1080:0:0:0:8:800:200C:4171]:11",
       true,
+      "1080:0:0:0:8:800:200C:4171",
+      11
+    },
+    {
       "[1080:0:0:0:8:800:200C:4171]",
-      11,
+      true,
+      "1080:0:0:0:8:800:200C:4171",
+      -1
     },
+
+    // Because no validation is done on the host, the following are accepted,
+    // even though they are invalid names.
+    {"]", true, "]", -1},
+    {"::1", true, ":", 1},
     // Invalid inputs:
     {"foo:bar", false, "", -1},
     {"foo:", false, "", -1},
     {":", false, "", -1},
     {":80", false, "", -1},
     {"", false, "", -1},
     {"porttoolong:300000", false, "", -1},
     {"usrname@host", false, "", -1},
     {"usrname:password@host", false, "", -1},
     {":password@host", false, "", -1},
     {":password@host:80", false, "", -1},
     {":password@host", false, "", -1},
     {"@host", false, "", -1},
+    {"[", false, "", -1},
+    {"[]", false, "", -1},
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
     std::string host;
     int port;
     bool ok = ParseHostAndPort(tests[i].input, &host, &port);
 
     EXPECT_EQ(tests[i].success, ok);
 
     if (tests[i].success) {
@@ skipping 698 matching lines @@
 TEST_P(NetUtilNonUniqueNameTest, IsHostnameNonUnique) {
   const NonUniqueNameTestData& test_data = GetParam();
 
   EXPECT_EQ(test_data.is_unique, IsUnique(test_data.hostname));
 }
 
 INSTANTIATE_TEST_CASE_P(, NetUtilNonUniqueNameTest,
                         testing::ValuesIn(kNonUniqueNameTestData));
 
 }  // namespace net