Revert of Replace readable with receiving where receiving means receiving anything (stun ping, response or da…

webrtc/p2p/base/port_unittest.cc

Index: webrtc/p2p/base/port_unittest.cc
diff --git a/webrtc/p2p/base/port_unittest.cc b/webrtc/p2p/base/port_unittest.cc
index c4fa5f8331c877b2dc52e82ee318870b26b46708..453b77c9029a3a3faaa8c82579f0efb12d014734 100644
--- a/webrtc/p2p/base/port_unittest.cc
+++ b/webrtc/p2p/base/port_unittest.cc
@@ -821,7 +821,7 @@
 
     if (same_addr1 && same_addr2) {
       // The new ping got back to the source.
-      EXPECT_TRUE(ch1.conn()->receiving());
+      EXPECT_EQ(Connection::STATE_READABLE, ch1.conn()->read_state());
       EXPECT_EQ(Connection::STATE_WRITABLE, ch2.conn()->write_state());
 
       // First connection may not be writable if the first ping did not get
@@ -841,7 +841,7 @@
       // able to get a ping from it. This gives us the real source address.
       ch1.Ping();
       EXPECT_TRUE_WAIT(!ch2.remote_address().IsNil(), kTimeout);
-      EXPECT_FALSE(ch2.conn()->receiving());
+      EXPECT_EQ(Connection::STATE_READ_INIT, ch2.conn()->read_state());
       EXPECT_TRUE(ch1.remote_address().IsNil());
 
       // Pick up the actual address and establish the connection.
@@ -854,7 +854,7 @@
       // The new ping came in, but from an unexpected address. This will happen
       // when the destination NAT is symmetric.
       EXPECT_FALSE(ch1.remote_address().IsNil());
-      EXPECT_FALSE(ch1.conn()->receiving());
+      EXPECT_EQ(Connection::STATE_READ_INIT, ch1.conn()->read_state());
 
       // Update our address and complete the connection.
       ch1.AcceptConnection(GetCandidate(port2));
@@ -876,14 +876,14 @@
   ASSERT_TRUE(ch1.conn() != NULL);
   ASSERT_TRUE(ch2.conn() != NULL);
   if (possible) {
-    EXPECT_TRUE(ch1.conn()->receiving());
+    EXPECT_EQ(Connection::STATE_READABLE, ch1.conn()->read_state());
     EXPECT_EQ(Connection::STATE_WRITABLE, ch1.conn()->write_state());
-    EXPECT_TRUE(ch2.conn()->receiving());
+    EXPECT_EQ(Connection::STATE_READABLE, ch2.conn()->read_state());
     EXPECT_EQ(Connection::STATE_WRITABLE, ch2.conn()->write_state());
   } else {
-    EXPECT_FALSE(ch1.conn()->receiving());
+    EXPECT_NE(Connection::STATE_READABLE, ch1.conn()->read_state());
     EXPECT_NE(Connection::STATE_WRITABLE, ch1.conn()->write_state());
-    EXPECT_FALSE(ch2.conn()->receiving());
+    EXPECT_NE(Connection::STATE_READABLE, ch2.conn()->read_state());
     EXPECT_NE(Connection::STATE_WRITABLE, ch2.conn()->write_state());
   }
 
@@ -1273,7 +1273,7 @@
   // response.
   lport->Reset();
   lport->AddCandidateAddress(kLocalAddr2);
-  // Creating a different connection as |conn| is receiving.
+  // Creating a different connection as |conn| is in STATE_READABLE.
   Connection* conn1 = lport->CreateConnection(lport->Candidates()[1],
                                               Port::ORIGIN_MESSAGE);
   conn1->Ping(0);