[net] Make IPEndPoint::GetFamily() return AddressFamily and add GetSockAddrFamily() to be used when…

jingle/glue/utils.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 "jingle/glue/utils.h"
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_util.h"
 #include "third_party/libjingle/source/talk/base/byteorder.h"
 #include "third_party/libjingle/source/talk/base/socketaddress.h"
 #include "third_party/libjingle/source/talk/p2p/base/candidate.h"
 
 namespace jingle_glue {
 
 bool IPEndPointToSocketAddress(const net::IPEndPoint& address_chrome,
                                talk_base::SocketAddress* address_lj) {
-  if (address_chrome.GetFamily() != AF_INET) {
+  if (address_chrome.GetFamily() != net::ADDRESS_FAMILY_IPV4) {
     LOG(ERROR) << "Only IPv4 addresses are supported.";
     return false;
   }
   uint32 ip_as_int = talk_base::NetworkToHost32(
       *reinterpret_cast<const uint32*>(&address_chrome.address()[0]));
   *address_lj =  talk_base::SocketAddress(ip_as_int, address_chrome.port());
   return true;
 }
 
 bool SocketAddressToIPEndPoint(const talk_base::SocketAddress& address_lj,
@@ skipping 58 matching lines @@
   candidate->set_protocol(protocol);
   candidate->set_username(username);
   candidate->set_password(password);
   candidate->set_preference(static_cast<float>(preference));
   candidate->set_generation(generation);
 
   return true;
 }
 
 }  // namespace jingle_glue