Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1273)

Unified Diff: net/http/http_network_transaction_unittest.cc

Issue 1565303002: Change IPEndpoint::address() to return a net::IPAddress (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Android Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/http/http_network_transaction_unittest.cc
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
index ed7470b3a618ffba8be29837496992d3e2f5ca21..e583369411a6aa5670bba2aa988e6c852fc55f03 100644
--- a/net/http/http_network_transaction_unittest.cc
+++ b/net/http/http_network_transaction_unittest.cc
@@ -397,7 +397,7 @@ class HttpNetworkTransactionTest
bool got_endpoint =
trans->GetRemoteEndpoint(&out.remote_endpoint_after_start);
EXPECT_EQ(got_endpoint,
- out.remote_endpoint_after_start.address().size() > 0);
+ out.remote_endpoint_after_start.address_number().size() > 0);
rv = ReadTransaction(trans.get(), &out.response_data);
EXPECT_EQ(OK, rv);
@@ -726,7 +726,7 @@ TEST_P(HttpNetworkTransactionTest, SimpleGET) {
EXPECT_EQ(reads_size, out.total_received_bytes);
EXPECT_EQ(0u, out.connection_attempts.size());
- EXPECT_FALSE(out.remote_endpoint_after_start.address().empty());
+ EXPECT_FALSE(out.remote_endpoint_after_start.address_number().empty());
}
// Response with no status line.
@@ -1645,7 +1645,7 @@ TEST_P(HttpNetworkTransactionTest, NonKeepAliveConnectionReset) {
IPEndPoint endpoint;
EXPECT_TRUE(trans->GetRemoteEndpoint(&endpoint));
- EXPECT_LT(0u, endpoint.address().size());
+ EXPECT_LT(0u, endpoint.address_number().size());
}
// What do various browsers do when the server closes a non-keepalive
@@ -2157,7 +2157,7 @@ TEST_P(HttpNetworkTransactionTest, BasicAuthWithAddressChange) {
IPEndPoint endpoint;
EXPECT_TRUE(trans->GetRemoteEndpoint(&endpoint));
- ASSERT_FALSE(endpoint.address().empty());
+ ASSERT_FALSE(endpoint.address_number().empty());
EXPECT_EQ("127.0.0.1:80", endpoint.ToString());
resolver->rules()->ClearRules();
@@ -2188,7 +2188,7 @@ TEST_P(HttpNetworkTransactionTest, BasicAuthWithAddressChange) {
EXPECT_EQ(100, response->headers->GetContentLength());
EXPECT_TRUE(trans->GetRemoteEndpoint(&endpoint));
- ASSERT_FALSE(endpoint.address().empty());
+ ASSERT_FALSE(endpoint.address_number().empty());
EXPECT_EQ("127.0.0.2:80", endpoint.ToString());
}
@@ -9061,7 +9061,7 @@ TEST_P(HttpNetworkTransactionTest, RequestWriteError) {
IPEndPoint endpoint;
EXPECT_TRUE(trans->GetRemoteEndpoint(&endpoint));
- EXPECT_LT(0u, endpoint.address().size());
+ EXPECT_LT(0u, endpoint.address_number().size());
}
// Check that a connection closed after the start of the headers finishes ok.
@@ -9104,7 +9104,7 @@ TEST_P(HttpNetworkTransactionTest, ConnectionClosedAfterStartOfHeaders) {
IPEndPoint endpoint;
EXPECT_TRUE(trans->GetRemoteEndpoint(&endpoint));
- EXPECT_LT(0u, endpoint.address().size());
+ EXPECT_LT(0u, endpoint.address_number().size());
}
// Make sure that a dropped connection while draining the body for auth
@@ -14111,7 +14111,7 @@ TEST_P(HttpNetworkTransactionTest, HttpSyncConnectError) {
IPEndPoint endpoint;
EXPECT_FALSE(trans->GetRemoteEndpoint(&endpoint));
- EXPECT_TRUE(endpoint.address().empty());
+ EXPECT_TRUE(endpoint.address_number().empty());
}
TEST_P(HttpNetworkTransactionTest, HttpAsyncConnectError) {
@@ -14148,7 +14148,7 @@ TEST_P(HttpNetworkTransactionTest, HttpAsyncConnectError) {
IPEndPoint endpoint;
EXPECT_FALSE(trans->GetRemoteEndpoint(&endpoint));
- EXPECT_TRUE(endpoint.address().empty());
+ EXPECT_TRUE(endpoint.address_number().empty());
}
TEST_P(HttpNetworkTransactionTest, HttpSyncWriteError) {

Powered by Google App Engine
This is Rietveld 408576698