| Index: net/base/address_list_unittest.cc
|
| diff --git a/net/base/address_list_unittest.cc b/net/base/address_list_unittest.cc
|
| index 32c3e521642438007d5810a0810d743d99492bf7..9c886ca09c256e75d7f1dcf791b157990ec13a81 100644
|
| --- a/net/base/address_list_unittest.cc
|
| +++ b/net/base/address_list_unittest.cc
|
| @@ -29,7 +29,7 @@ TEST(AddressListTest, Canonical) {
|
| ai.ai_socktype = SOCK_STREAM;
|
| ai.ai_addrlen = sizeof(address);
|
| ai.ai_addr = reinterpret_cast<sockaddr*>(&address);
|
| - ai.ai_canonname = const_cast<char *>(kCanonicalHostname);
|
| + ai.ai_canonname = const_cast<char*>(kCanonicalHostname);
|
|
|
| // Copy the addrinfo struct into an AddressList object and
|
| // make sure it seems correct.
|
| @@ -95,28 +95,21 @@ TEST(AddressListTest, CreateFromIPAddressList) {
|
| size_t in_addr_offset;
|
| size_t in_addr_size;
|
| } tests[] = {
|
| - { "127.0.0.1",
|
| - "\x7f\x00\x00\x01",
|
| - AF_INET,
|
| - sizeof(struct sockaddr_in),
|
| - offsetof(struct sockaddr_in, sin_addr),
|
| - sizeof(struct in_addr),
|
| - },
|
| - { "2001:db8:0::42",
|
| - "\x20\x01\x0d\xb8\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x42",
|
| - AF_INET6,
|
| - sizeof(struct sockaddr_in6),
|
| - offsetof(struct sockaddr_in6, sin6_addr),
|
| - sizeof(struct in6_addr),
|
| - },
|
| - { "192.168.1.1",
|
| - "\xc0\xa8\x01\x01",
|
| - AF_INET,
|
| - sizeof(struct sockaddr_in),
|
| - offsetof(struct sockaddr_in, sin_addr),
|
| - sizeof(struct in_addr),
|
| - },
|
| - };
|
| + {
|
| + "127.0.0.1", "\x7f\x00\x00\x01", AF_INET, sizeof(struct sockaddr_in),
|
| + offsetof(struct sockaddr_in, sin_addr), sizeof(struct in_addr),
|
| + },
|
| + {
|
| + "2001:db8:0::42",
|
| + "\x20\x01\x0d\xb8\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x42",
|
| + AF_INET6, sizeof(struct sockaddr_in6),
|
| + offsetof(struct sockaddr_in6, sin6_addr), sizeof(struct in6_addr),
|
| + },
|
| + {
|
| + "192.168.1.1", "\xc0\xa8\x01\x01", AF_INET, sizeof(struct sockaddr_in),
|
| + offsetof(struct sockaddr_in, sin_addr), sizeof(struct in_addr),
|
| + },
|
| + };
|
| const std::string kCanonicalName = "canonical.example.com";
|
|
|
| // Construct a list of ip addresses.
|
| @@ -127,8 +120,8 @@ TEST(AddressListTest, CreateFromIPAddressList) {
|
| ip_list.push_back(ip_number);
|
| }
|
|
|
| - AddressList test_list = AddressList::CreateFromIPAddressList(ip_list,
|
| - kCanonicalName);
|
| + AddressList test_list =
|
| + AddressList::CreateFromIPAddressList(ip_list, kCanonicalName);
|
| std::string canonical_name;
|
| EXPECT_EQ(kCanonicalName, test_list.canonical_name());
|
| EXPECT_EQ(ARRAYSIZE_UNSAFE(tests), test_list.size());
|
|
|