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

net/spdy/spdy_framer.cc

Index: net/spdy/spdy_framer.cc
diff --git a/net/spdy/spdy_framer.cc b/net/spdy/spdy_framer.cc
index 32415e1ceead43a110b1c87799be47004696053d..16e298fab06a9d09de7d1443f78e3cad5d615d83 100644
--- a/net/spdy/spdy_framer.cc
+++ b/net/spdy/spdy_framer.cc
@@ -53,7 +53,7 @@ base::LazyInstance<DictionaryIds>::Leaky g_dictionary_ids;
 FlagsAndLength CreateFlagsAndLength(SpdyControlFlags flags, size_t length) {
   DCHECK_EQ(0u, length & ~static_cast<size_t>(kLengthMask));
   FlagsAndLength flags_length;
-  flags_length.length_ = htonl(static_cast<uint32>(length));
+  flags_length.length_ = base::HostToNet32(static_cast<uint32>(length));
   DCHECK_EQ(0, flags & ~kControlFlagsMask);
   flags_length.flags_[0] = flags;
   return flags_length;
@@ -103,7 +103,8 @@ SettingsFlagsAndId SettingsFlagsAndId::FromWireFormat(int version,
   if (version < 3) {
     ConvertFlagsAndIdForSpdy2(&wire);
   }
-  return SettingsFlagsAndId(ntohl(wire) >> 24, ntohl(wire) & 0x00ffffff);
+  return SettingsFlagsAndId(base::NetToHost32(wire) >> 24,
+                            base::NetToHost32(wire) & 0x00ffffff);
 }
 
 SettingsFlagsAndId::SettingsFlagsAndId(uint8 flags, uint32 id)
@@ -112,7 +113,8 @@ SettingsFlagsAndId::SettingsFlagsAndId(uint8 flags, uint32 id)
 }
 
 uint32 SettingsFlagsAndId::GetWireFormat(int version) const {
-  uint32 wire = htonl(id_ & 0x00ffffff) | htonl(flags_ << 24);
+  uint32 wire =
+      base::HostToNet32(id_ & 0x00ffffff) | base::HostToNet32(flags_ << 24);
   if (version < 3) {
     ConvertFlagsAndIdForSpdy2(&wire);
   }
@@ -790,7 +792,8 @@ bool SpdyFramer::ProcessSetting(const char* data) {
   SettingsFlagsAndId id_and_flags =
       SettingsFlagsAndId::FromWireFormat(spdy_version_, id_and_flags_wire);
   uint8 flags = id_and_flags.flags();
-  uint32 value = ntohl(*(reinterpret_cast<const uint32*>(data + 4)));
+  uint32 value =
+      base::NetToHost32(*(reinterpret_cast<const uint32*>(data + 4)));
 
   // Validate id.
   switch (id_and_flags.id()) {
@@ -1005,7 +1008,7 @@ bool SpdyFramer::ParseSettings(const SpdySettingsControlFrame* frame,
     uint32 id_and_flags_wire;
     uint32 value;
     // SettingsFlagsAndId accepts off-the-wire (network byte order) data, so we
-    // use ReadBytes() instead of ReadUInt32() as the latter calls ntohl().
+    // use ReadBytes() instead of ReadUInt32(), which calls base::NetToHost32().
     if (!parser.ReadBytes(&id_and_flags_wire, 4)) {
       return false;
     }
@@ -1076,7 +1079,7 @@ SpdySynStreamControlFrame* SpdyFramer::CreateSynStream(
     priority = GetLowestPriority();
   }
   // Priority is 2 bits for <spdy3, 3 bits otherwise.
-  frame.WriteUInt16(ntohs(priority) << (spdy_version_ < 3 ? 6 : 5));
+  frame.WriteUInt16(base::NetToHost16(priority) << (spdy_version_ < 3 ? 6 : 5));
   WriteHeaderBlock(&frame, headers);
 
   scoped_ptr<SpdySynStreamControlFrame> syn_frame(
@@ -1295,7 +1298,7 @@ SpdyDataFrame* SpdyFramer::CreateDataFrame(SpdyStreamId stream_id,
 
   DCHECK_EQ(0u, len & ~static_cast<size_t>(kLengthMask));
   FlagsAndLength flags_length;
-  flags_length.length_ = htonl(len);
+  flags_length.length_ = base::HostToNet32(len);
   DCHECK_EQ(0, flags & ~kDataFlagsMask);
   flags_length.flags_[0] = flags;
   frame.WriteBytes(&flags_length, sizeof(flags_length));