Add base::HostToNetXX() & NetToHostXX(), and use them to replace htonX() & ntohX() in Chrome.

net/base/net_util.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 <algorithm>
 #include <iterator>
 #include <map>
 
@@ skipping 58 matching lines @@
 #include "unicode/regex.h"
 #include "unicode/ucnv.h"
 #include "unicode/uidna.h"
 #include "unicode/ulocdata.h"
 #include "unicode/uniset.h"
 #include "unicode/uscript.h"
 #include "unicode/uset.h"
 
 using base::Time;
 
-#if defined(OS_WIN)
-// Allow htons/ntohs to be called without requiring ws2_32.dll to be loaded,
-// which isn't available in Chrome's sandbox. See crbug.com/116591.
-// TODO(wez): Replace these calls with base::htons() etc when available.
-#define ntohs(x) _byteswap_ushort(x)
-#define htons(x) _byteswap_ushort(x)
-#endif // OS_WIN
-
 namespace net {
 
 namespace {
 
 // what we prepend to get a file URL
 static const FilePath::CharType kFileURLPrefix[] =
     FILE_PATH_LITERAL("file:///");
 
 // The general list of blocked ports. Will be blocked unless a specific
 // protocol overrides it. (Ex: ftp can use ports 20 and 21)
@@ skipping 2240 matching lines @@
   const struct sockaddr* address = info->ai_addr;
   DCHECK(address);
   DCHECK_EQ(info->ai_family, address->sa_family);
   return GetPortFieldFromSockaddr(address, info->ai_addrlen);
 }
 
 uint16 GetPortFromAddrinfo(const struct addrinfo* info) {
   const uint16* port_field = GetPortFieldFromAddrinfo(info);
   if (!port_field)
     return -1;
-  return ntohs(*port_field);
+  return base::NetToHost16(*port_field);
 }
 
 const uint16* GetPortFieldFromSockaddr(const struct sockaddr* address,
                                        socklen_t address_len) {
   if (address->sa_family == AF_INET) {
     DCHECK_LE(sizeof(sockaddr_in), static_cast<size_t>(address_len));
     const struct sockaddr_in* sockaddr =
         reinterpret_cast<const struct sockaddr_in*>(address);
     return &sockaddr->sin_port;
   } else if (address->sa_family == AF_INET6) {
     DCHECK_LE(sizeof(sockaddr_in6), static_cast<size_t>(address_len));
     const struct sockaddr_in6* sockaddr =
         reinterpret_cast<const struct sockaddr_in6*>(address);
     return &sockaddr->sin6_port;
   } else {
     NOTREACHED();
     return NULL;
   }
 }
 
 int GetPortFromSockaddr(const struct sockaddr* address, socklen_t address_len) {
   const uint16* port_field = GetPortFieldFromSockaddr(address, address_len);
   if (!port_field)
     return -1;
-  return ntohs(*port_field);
+  return base::NetToHost16(*port_field);
 }
 
 // Assign |port| to each address in the linked list starting from |head|.
 void SetPortForAllAddrinfos(struct addrinfo* head, uint16 port) {
   DCHECK(head);
   for (struct addrinfo* ai = head; ai; ai = ai->ai_next) {
     uint16* port_field = GetPortFieldFromAddrinfo(ai);
     if (port_field)
-      *port_field = htons(port);
+      *port_field = base::HostToNet16(port);
   }
 }
 
 bool IsLocalhost(const std::string& host) {
   if (host == "localhost" ||
       host == "localhost.localdomain" ||
       host == "localhost6" ||
       host == "localhost6.localdomain6")
     return true;
 
@@ skipping 29 matching lines @@
 
 NetworkInterface::NetworkInterface(const std::string& name,
                                    const IPAddressNumber& address)
     : name(name), address(address) {
 }
 
 NetworkInterface::~NetworkInterface() {
 }
 
 }  // namespace net