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

chrome/browser/chromeos/web_socket_proxy.cc

Index: chrome/browser/chromeos/web_socket_proxy.cc
diff --git a/chrome/browser/chromeos/web_socket_proxy.cc b/chrome/browser/chromeos/web_socket_proxy.cc
index 78236b62b0f01dc13825e0c898741f8841750996..fc4e50dc11c369227a3ea37df80933d2011125db 100644
--- a/chrome/browser/chromeos/web_socket_proxy.cc
+++ b/chrome/browser/chromeos/web_socket_proxy.cc
@@ -841,8 +841,9 @@ void Serv::Run() {
   struct sockaddr_in addr;
   memset(&addr, 0, sizeof(addr));
   addr.sin_family = AF_INET;
-  addr.sin_port = htons(0);  // let OS allocatate ephemeral port number.
-  addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+  // Let the OS allocate a port number.
+  addr.sin_port = base::HostToNet16(0);
+  addr.sin_addr.s_addr = base::HostToNet32(INADDR_LOOPBACK);
   if (bind(listening_sock_,
            reinterpret_cast<struct sockaddr*>(&addr),
            sizeof(addr))) {
@@ -883,8 +884,8 @@ void Serv::Run() {
     const int kPort = 10101;
     memset(&addr, 0, sizeof(addr));
     addr.sin_family = AF_INET;
-    addr.sin_port = htons(kPort);
-    addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+    addr.sin_port = base::HostToNet16(kPort);
+    addr.sin_addr.s_addr = base::HostToNet32(INADDR_LOOPBACK);
     if (bind(extra_listening_sock_,
              reinterpret_cast<struct sockaddr*>(&addr),
              sizeof(addr))) {
@@ -934,7 +935,7 @@ void Serv::Run() {
   }
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
-      base::Bind(&SendNotification, ntohs(addr.sin_port)));
+      base::Bind(&SendNotification, base::NetToHost16(addr.sin_port)));
 
   LOG(INFO) << "WebSocketProxy: Starting event dispatch loop.";
   event_base_dispatch(evbase_);
@@ -1574,7 +1575,7 @@ void Conn::OnPrimchanRead(struct bufferevent* bev, EventKey evkey) {
             {
               struct sockaddr_in sa;
               memset(&sa, 0, sizeof(sa));
-              sa.sin_port = htons(cs->destport_);
+              sa.sin_port = base::HostToNet16(cs->destport_);
               if (inet_pton(sa.sin_family = AF_INET,
                             cs->destaddr_.c_str(),
                             &sa.sin_addr) == 1) {
@@ -1595,7 +1596,7 @@ void Conn::OnPrimchanRead(struct bufferevent* bev, EventKey evkey) {
               }
               struct sockaddr_in6 sa;
               memset(&sa, 0, sizeof(sa));
-              sa.sin6_port = htons(cs->destport_);
+              sa.sin6_port = base::HostToNet16(cs->destport_);
               if (inet_pton(sa.sin6_family = AF_INET6,
                             cs->destaddr_.c_str(),
                             &sa.sin6_addr) == 1) {
@@ -1754,7 +1755,7 @@ void Conn::OnDestResolutionIPv4(int result, char type,
       struct sockaddr_in sa;
       memset(&sa, 0, sizeof(sa));
       sa.sin_family = AF_INET;
-      sa.sin_port = htons(cs->destport_);
+      sa.sin_port = base::HostToNet16(cs->destport_);
       DCHECK(sizeof(sa.sin_addr) == sizeof(struct in_addr));
       memcpy(&sa.sin_addr,
              static_cast<struct in_addr*>(addr_list) + i,
@@ -1785,7 +1786,7 @@ void Conn::OnDestResolutionIPv6(int result, char type,
       struct sockaddr_in6 sa;
       memset(&sa, 0, sizeof(sa));
       sa.sin6_family = AF_INET6;
-      sa.sin6_port = htons(cs->destport_);
+      sa.sin6_port = base::HostToNet16(cs->destport_);
       DCHECK(sizeof(sa.sin6_addr) == sizeof(struct in6_addr));
       memcpy(&sa.sin6_addr,
              static_cast<struct in6_addr*>(addr_list) + i,