| Index: jingle/glue/utils.h
|
| diff --git a/jingle/glue/utils.h b/jingle/glue/utils.h
|
| index 99c0ac0d40610fb8e3d50ecc47e53af1ede930b0..1acd74965208c0b438befee589cdcd1491654b96 100644
|
| --- a/jingle/glue/utils.h
|
| +++ b/jingle/glue/utils.h
|
| @@ -7,10 +7,10 @@
|
|
|
| #include <string>
|
|
|
| -#include "net/base/ip_address_number.h"
|
| #include "third_party/webrtc/base/ipaddress.h"
|
|
|
| namespace net {
|
| +class IPAddress;
|
| class IPEndPoint;
|
| } // namespace net
|
|
|
| @@ -32,8 +32,7 @@ bool IPEndPointToSocketAddress(const net::IPEndPoint& ip_endpoint,
|
| bool SocketAddressToIPEndPoint(const rtc::SocketAddress& address,
|
| net::IPEndPoint* ip_endpoint);
|
|
|
| -rtc::IPAddress IPAddressNumberToIPAddress(
|
| - const net::IPAddressNumber& ip_address_number);
|
| +rtc::IPAddress NetIPAddressToRtcIPAddress(const net::IPAddress& ip_address);
|
|
|
| // Helper functions to serialize and deserialize P2P candidates.
|
| std::string SerializeP2PCandidate(const cricket::Candidate& candidate);
|
|
|