Update from https://crrev.com/305340

net/dns/dns_config_service_win_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/dns/dns_config_service_win.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/win/windows_version.h"
 #include "net/dns/dns_protocol.h"
@@ skipping 37 matching lines @@
       EXPECT_FALSE(result) << "Unexpected parse success on " << t.input;
     }
   }
 }
 
 struct AdapterInfo {
   IFTYPE if_type;
   IF_OPER_STATUS oper_status;
   const WCHAR* dns_suffix;
   std::string dns_server_addresses[4];  // Empty string indicates end.
-  int ports[4];
+  uint16 ports[4];
 };
 
 scoped_ptr<IP_ADAPTER_ADDRESSES, base::FreeDeleter> CreateAdapterAddresses(
     const AdapterInfo* infos) {
   size_t num_adapters = 0;
   size_t num_addresses = 0;
   for (size_t i = 0; infos[i].if_type; ++i) {
     ++num_adapters;
     for (size_t j = 0; !infos[i].dns_server_addresses[j].empty(); ++j) {
       ++num_addresses;
@@ skipping 26 matching lines @@
     for (size_t j = 0; !info.dns_server_addresses[j].empty(); ++j) {
       --num_addresses;
       if (j == 0) {
         address = adapter->FirstDnsServerAddress = addresses + num_addresses;
       } else {
         // Note that |address| is moving backwards.
         address = address->Next = address - 1;
       }
       IPAddressNumber ip;
       CHECK(ParseIPLiteralToNumber(info.dns_server_addresses[j], &ip));
-      IPEndPoint ipe(ip, info.ports[j]);
+      IPEndPoint ipe = IPEndPoint(ip, info.ports[j]);
       address->Address.lpSockaddr =
           reinterpret_cast<LPSOCKADDR>(storage + num_addresses);
       socklen_t length = sizeof(struct sockaddr_storage);
       CHECK(ipe.ToSockAddr(address->Address.lpSockaddr, &length));
       address->Address.iSockaddrLength = static_cast<int>(length);
     }
   }
 
   return heap.Pass();
 }
 
 TEST(DnsConfigServiceWinTest, ConvertAdapterAddresses) {
   // Check nameservers and connection-specific suffix.
   const struct TestCase {
     AdapterInfo input_adapters[4];        // |if_type| == 0 indicates end.
     std::string expected_nameservers[4];  // Empty string indicates end.
     std::string expected_suffix;
-    int expected_ports[4];
+    uint16 expected_ports[4];
   } cases[] = {
     {  // Ignore loopback and inactive adapters.
       {
         { IF_TYPE_SOFTWARE_LOOPBACK, IfOperStatusUp, L"funnyloop",
           { "2.0.0.2" } },
         { IF_TYPE_FASTETHER, IfOperStatusDormant, L"example.com",
           { "1.0.0.1" } },
         { IF_TYPE_USB, IfOperStatusUp, L"chromium.org",
           { "10.0.0.10", "2001:FFFF::1111" } },
         { 0 },
@@ skipping 40 matching lines @@
   for (size_t i = 0; i < arraysize(cases); ++i) {
     const TestCase& t = cases[i];
     internal::DnsSystemSettings settings = {
       CreateAdapterAddresses(t.input_adapters),
       // Default settings for the rest.
     };
     std::vector<IPEndPoint> expected_nameservers;
     for (size_t j = 0; !t.expected_nameservers[j].empty(); ++j) {
       IPAddressNumber ip;
       ASSERT_TRUE(ParseIPLiteralToNumber(t.expected_nameservers[j], &ip));
-      int port = t.expected_ports[j];
+      uint16 port = t.expected_ports[j];
       if (!port)
         port = dns_protocol::kDefaultPort;
       expected_nameservers.push_back(IPEndPoint(ip, port));
     }
 
     DnsConfig config;
     internal::ConfigParseWinResult result =
         internal::ConvertSettingsToDnsConfig(settings, &config);
     internal::ConfigParseWinResult expected_result =
         expected_nameservers.empty() ? internal::CONFIG_PARSE_WIN_NO_NAMESERVERS
@@ skipping 263 matching lines @@
     EXPECT_EQ(t.unhandled_options, config.unhandled_options);
     EXPECT_EQ(t.have_nrpt, config.use_local_ipv6);
   }
 }
 
 
 }  // namespace
 
 }  // namespace net