Land Recent QUIC changes.

net/base/ip_endpoint.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/ip_endpoint.h"
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/sys_byteorder.h"
 #if defined(OS_WIN)
@@ skipping 17 matching lines @@
 IPEndPoint::IPEndPoint(const IPAddressNumber& address, int port)
     : address_(address),
       port_(port) {}
 
 IPEndPoint::IPEndPoint(const IPEndPoint& endpoint) {
   address_ = endpoint.address_;
   port_ = endpoint.port_;
 }
 
 AddressFamily IPEndPoint::GetFamily() const {
-  switch (address_.size()) {
-    case kIPv4AddressSize:
-      return ADDRESS_FAMILY_IPV4;
-    case kIPv6AddressSize:
-      return ADDRESS_FAMILY_IPV6;
-    default:
-      NOTREACHED() << "Bad IP address";
-      return ADDRESS_FAMILY_UNSPECIFIED;
-  }
+  return GetAddressFamily(address_);
 }
 
 int IPEndPoint::GetSockAddrFamily() const {
   switch (address_.size()) {
     case kIPv4AddressSize:
       return AF_INET;
     case kIPv6AddressSize:
       return AF_INET6;
     default:
       NOTREACHED() << "Bad IP address";
@@ skipping 69 matching lines @@
     return address_ < that.address_;
   }
   return port_ < that.port_;
 }
 
 bool IPEndPoint::operator==(const IPEndPoint& that) const {
   return address_ == that.address_ && port_ == that.port_;
 }
 
 }  // namespace net