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

crypto/symmetric_key_win.cc

 // Copyright (c) 2011 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 "crypto/symmetric_key.h"
 
-#include <winsock2.h>  // For htonl.
-
 #include <vector>
 
 // TODO(wtc): replace scoped_array by std::vector.
 #include "base/memory/scoped_ptr.h"
+#include "base/sys_byteorder.h"
 
 namespace crypto {
 
 namespace {
 
 // The following is a non-public Microsoft header documented in MSDN under
 // CryptImportKey / CryptExportKey. Following the header is the byte array of
 // the actual plaintext key.
 struct PlaintextBlobHeader {
   BLOBHEADER hdr;
@@ skipping 233 matching lines @@
   if (!ok)
     return false;
 
   // Iteration U_1: Compute PRF for S.
   ok = CryptHashData(safe_hash, reinterpret_cast<const BYTE*>(salt.data()),
                      salt.size(), 0);
   if (!ok)
     return false;
 
   // Iteration U_1: and append (big-endian) INT (i).
-  uint32 big_endian_block_index = htonl(block_index);
+  uint32 big_endian_block_index = base::HostToNet32(block_index);
   ok = CryptHashData(safe_hash,
                      reinterpret_cast<BYTE*>(&big_endian_block_index),
                      sizeof(big_endian_block_index), 0);
 
   std::vector<BYTE> hash_value(hash_size);
 
   DWORD size = hash_size;
   ok = CryptGetHashParam(safe_hash, HP_HASHVAL, &hash_value[0], &size, 0);
   if (!ok  || size != hash_size)
     return false;
@@ skipping 250 matching lines @@
                            HCRYPTKEY key,
                            const void* key_data, size_t key_size_in_bytes)
     : provider_(provider), key_(key) {
   if (key_data) {
     raw_key_.assign(reinterpret_cast<const char*>(key_data),
                     key_size_in_bytes);
   }
 }
 
 }  // namespace crypto