Land Recent QUIC changes.

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 <algorithm>
 
@@ skipping 3153 matching lines @@
 
 TEST(NetUtilTest, GetHostOrSpecFromURL) {
   EXPECT_EQ("example.com",
             GetHostOrSpecFromURL(GURL("http://example.com/test")));
   EXPECT_EQ("example.com",
             GetHostOrSpecFromURL(GURL("http://example.com./test")));
   EXPECT_EQ("file:///tmp/test.html",
             GetHostOrSpecFromURL(GURL("file:///tmp/test.html")));
 }
 
+TEST(NetUtilTest, GetAddressFamily) {
+  IPAddressNumber number;
+  EXPECT_TRUE(ParseIPLiteralToNumber("192.168.0.1", &number));
+  EXPECT_EQ(ADDRESS_FAMILY_IPV4, GetAddressFamily(number));
+  EXPECT_TRUE(ParseIPLiteralToNumber("1:abcd::3:4:ff", &number));
+  EXPECT_EQ(ADDRESS_FAMILY_IPV6, GetAddressFamily(number));
+}
+
 // Test that invalid IP literals fail to parse.
 TEST(NetUtilTest, ParseIPLiteralToNumber_FailParse) {
   IPAddressNumber number;
 
   EXPECT_FALSE(ParseIPLiteralToNumber("bad value", &number));
   EXPECT_FALSE(ParseIPLiteralToNumber("bad:value", &number));
   EXPECT_FALSE(ParseIPLiteralToNumber(std::string(), &number));
   EXPECT_FALSE(ParseIPLiteralToNumber("192.168.0.1:30", &number));
   EXPECT_FALSE(ParseIPLiteralToNumber("  192.168.0.1  ", &number));
   EXPECT_FALSE(ParseIPLiteralToNumber("[::1]", &number));
@@ skipping 303 matching lines @@
         kUnsafePortableBasenames[i]))) << kUnsafePortableBasenames[i];
     if (!base::FilePath::StringType(kUnsafePortableBasenames[i]).empty()) {
       EXPECT_FALSE(IsSafePortableRelativePath(safe_dirname.Append(
           base::FilePath(kUnsafePortableBasenames[i]))))
         << kUnsafePortableBasenames[i];
     }
   }
 }
 
 }  // namespace net