Land Recent QUIC changes.

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 1588 matching lines @@
 
 std::string IPAddressToString(const IPAddressNumber& addr) {
   return IPAddressToString(&addr.front(), addr.size());
 }
 
 std::string IPAddressToStringWithPort(const IPAddressNumber& addr,
                                       uint16 port) {
   return IPAddressToStringWithPort(&addr.front(), addr.size(), port);
 }
 
+std::string IPAddressToPackedString(const IPAddressNumber& addr) {
+  return std::string(reinterpret_cast<const char *>(&addr.front()),
+                     addr.size());
+}
+
 std::string GetHostName() {
 #if defined(OS_WIN)
   EnsureWinsockInit();
 #endif
 
   // Host names are limited to 255 bytes.
   char buffer[256];
   int result = gethostname(buffer, sizeof(buffer));
   if (result != 0) {
     DVLOG(1) << "gethostname() failed with " << result;
@@ skipping 542 matching lines @@
 
 NetworkInterface::NetworkInterface(const std::string& name,
                                    const IPAddressNumber& address)
     : name(name), address(address) {
 }
 
 NetworkInterface::~NetworkInterface() {
 }
 
 }  // namespace net