From 8ac544e811439f79b2ec0c676f383ddc51ef2ed5 Mon Sep 17 00:00:00 2001
From: tfarina <tfarina@chromium.org>
Date: Thu, 8 Oct 2015 07:15:44 -0700
Subject: [PATCH] Get rid of deprecated SocketAddress::IsAny() method.

This patch converts the usage of IsAny() to IsAnyIP() and removes the
deprecated method.

BUG=None
R=pthatcher@webrtc.org

Review URL: https://codereview.webrtc.org/1392153002

Cr-Commit-Position: refs/heads/master@{#10220}
---
 webrtc/base/physicalsocketserver.cc | 2 +-
 webrtc/base/socketaddress.h         | 1 -
 webrtc/base/virtualsocketserver.cc  | 2 +-
 webrtc/base/win32socketserver.cc    | 2 +-
 webrtc/p2p/base/transport.cc        | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/webrtc/base/physicalsocketserver.cc b/webrtc/base/physicalsocketserver.cc
index 01f0731f3c..86abcf279b 100644
--- a/webrtc/base/physicalsocketserver.cc
+++ b/webrtc/base/physicalsocketserver.cc
@@ -400,7 +400,7 @@ class PhysicalSocket : public AsyncSocket, public sigslot::has_slots<> {
 
   int EstimateMTU(uint16_t* mtu) override {
     SocketAddress addr = GetRemoteAddress();
-    if (addr.IsAny()) {
+    if (addr.IsAnyIP()) {
       SetError(ENOTCONN);
       return -1;
     }
diff --git a/webrtc/base/socketaddress.h b/webrtc/base/socketaddress.h
index 44183f3aeb..1574ef916e 100644
--- a/webrtc/base/socketaddress.h
+++ b/webrtc/base/socketaddress.h
@@ -128,7 +128,6 @@ class SocketAddress {
   // That is, 0.0.0.0 or ::.
   // Hostname and/or port may be set.
   bool IsAnyIP() const;
-  inline bool IsAny() const { return IsAnyIP(); }  // deprecated
 
   // Determines whether the IP address refers to a loopback address.
   // For v4 addresses this means the address is in the range 127.0.0.0/8.
diff --git a/webrtc/base/virtualsocketserver.cc b/webrtc/base/virtualsocketserver.cc
index 867aeec630..c6d402f1f3 100644
--- a/webrtc/base/virtualsocketserver.cc
+++ b/webrtc/base/virtualsocketserver.cc
@@ -385,7 +385,7 @@ int VirtualSocket::EstimateMTU(uint16_t* mtu) {
 
 void VirtualSocket::OnMessage(Message* pmsg) {
   if (pmsg->message_id == MSG_ID_PACKET) {
-    // ASSERT(!local_addr_.IsAny());
+    // ASSERT(!local_addr_.IsAnyIP());
     ASSERT(NULL != pmsg->pdata);
     Packet* packet = static_cast<Packet*>(pmsg->pdata);
 
diff --git a/webrtc/base/win32socketserver.cc b/webrtc/base/win32socketserver.cc
index 743f8c0d59..f466bf10cb 100644
--- a/webrtc/base/win32socketserver.cc
+++ b/webrtc/base/win32socketserver.cc
@@ -514,7 +514,7 @@ int Win32Socket::Close() {
 
 int Win32Socket::EstimateMTU(uint16_t* mtu) {
   SocketAddress addr = GetRemoteAddress();
-  if (addr.IsAny()) {
+  if (addr.IsAnyIP()) {
     error_ = ENOTCONN;
     return -1;
   }
diff --git a/webrtc/p2p/base/transport.cc b/webrtc/p2p/base/transport.cc
index 80ae900ae6..58817df79d 100644
--- a/webrtc/p2p/base/transport.cc
+++ b/webrtc/p2p/base/transport.cc
@@ -270,7 +270,7 @@ void Transport::CallChannels(TransportChannelFunc func) {
 
 bool Transport::VerifyCandidate(const Candidate& cand, std::string* error) {
   // No address zero.
-  if (cand.address().IsNil() || cand.address().IsAny()) {
+  if (cand.address().IsNil() || cand.address().IsAnyIP()) {
     *error = "candidate has address of zero";
     return false;
   }