Migrate content/*/p2p/* code to net::IPAddress.

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 <stdint.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_address.h"
 #include "net/base/ip_endpoint.h"
 #include "third_party/webrtc/base/byteorder.h"
 #include "third_party/webrtc/base/socketaddress.h"
 #include "third_party/webrtc/p2p/base/candidate.h"
 
 namespace jingle_glue {
 
 bool IPEndPointToSocketAddress(const net::IPEndPoint& ip_endpoint,
                                rtc::SocketAddress* address) {
   sockaddr_storage addr;
   socklen_t len = sizeof(addr);
   return ip_endpoint.ToSockAddr(reinterpret_cast<sockaddr*>(&addr), &len) &&
       rtc::SocketAddressFromSockAddrStorage(addr, address);
 }
 
 bool SocketAddressToIPEndPoint(const rtc::SocketAddress& address,
                                net::IPEndPoint* ip_endpoint) {
   sockaddr_storage addr;
   int size = address.ToSockAddrStorage(&addr);
   return (size > 0) &&
       ip_endpoint->FromSockAddr(reinterpret_cast<sockaddr*>(&addr), size);
 }
 
-rtc::IPAddress IPAddressNumberToIPAddress(
-    const net::IPAddressNumber& ip_address_number) {
-  if (ip_address_number.size() == net::kIPv4AddressSize) {
+rtc::IPAddress NetIPAddressToIPAddress(const net::IPAddress& ip_address) {
+  if (ip_address.IsIPv4()) {
     uint32_t address;
-    memcpy(&address, &ip_address_number[0], sizeof(uint32_t));
+    memcpy(&address, ip_address.bytes().data(), sizeof(uint32_t));
     address = rtc::NetworkToHost32(address);
     return rtc::IPAddress(address);
   }
-  if (ip_address_number.size() == net::kIPv6AddressSize) {
+  if (ip_address.IsIPv6()) {
     in6_addr address;
-    memcpy(&address, &ip_address_number[0], sizeof(in6_addr));
+    memcpy(&address, ip_address.bytes().data(), sizeof(in6_addr));
     return rtc::IPAddress(address);
   }
   return rtc::IPAddress();
 }
 
 std::string SerializeP2PCandidate(const cricket::Candidate& candidate) {
   // TODO(sergeyu): Use SDP to format candidates?
   base::DictionaryValue value;
   value.SetString("ip", candidate.address().ipaddr().ToString());
   value.SetInteger("port", candidate.address().port());
@@ skipping 45 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