Change IPEndpoint::address() to return a net::IPAddress

net/tools/quic/end_to_end_test.cc

Index: net/tools/quic/end_to_end_test.cc
diff --git a/net/tools/quic/end_to_end_test.cc b/net/tools/quic/end_to_end_test.cc
index 6e408156c72ad31b0834cb0360bb3bc9efcf8743..42a6f9511b1391edfd392fb5168e38289d08e682 100644
--- a/net/tools/quic/end_to_end_test.cc
+++ b/net/tools/quic/end_to_end_test.cc
@@ -410,7 +410,7 @@ class EndToEndTest : public ::testing::TestWithParam<TestParams> {
     }
     server_thread_->Initialize();
     server_address_ =
-        IPEndPoint(server_address_.address(), server_thread_->GetPort());
+        IPEndPoint(server_address_.address_number(), server_thread_->GetPort());
     QuicDispatcher* dispatcher =
         QuicServerPeer::GetDispatcher(server_thread_->server());
     TestWriterFactory* packet_writer_factory = new TestWriterFactory();
@@ -1451,7 +1451,7 @@ class WrongAddressWriter : public QuicPacketWriterWrapper {
                           const IPEndPoint& peer_address) override {
     // Use wrong address!
     return QuicPacketWriterWrapper::WritePacket(
-        buffer, buf_len, self_address_.address(), peer_address);
+        buffer, buf_len, self_address_.address_number(), peer_address);
   }
 
   bool IsWriteBlockedDataBuffered() const override { return false; }
@@ -1466,7 +1466,8 @@ TEST_P(EndToEndTest, ConnectionMigrationClientIPChanged) {
   EXPECT_EQ(200u, client_->response_headers()->parsed_response_code());
 
   // Store the client IP address which was used to send the first request.
-  IPAddressNumber old_host = client_->client()->client_address().address();
+  IPAddressNumber old_host =
+      client_->client()->client_address().address_number();
 
   // Migrate socket to the new IP address.
   IPAddressNumber new_host;
@@ -1510,11 +1511,13 @@ TEST_P(EndToEndTest, ConnectionMigrationClientPortChanged) {
   // FD rather than any more complex NAT rebinding simulation.
   int new_port = client_->client()->client_address().port();
   QuicClientPeer::SetClientPort(client_->client(), new_port);
-  QuicConnectionPeer::SetSelfAddress(
-      client_->client()->session()->connection(),
-      IPEndPoint(
-          client_->client()->session()->connection()->self_address().address(),
-          new_port));
+  QuicConnectionPeer::SetSelfAddress(client_->client()->session()->connection(),
+                                     IPEndPoint(client_->client()
+                                                    ->session()
+                                                    ->connection()
+                                                    ->self_address()
+                                                    .address_number(),
+                                                new_port));
 
   // Register the new FD for epoll events.
   int new_fd = client_->client()->fd();
@@ -1526,7 +1529,7 @@ TEST_P(EndToEndTest, ConnectionMigrationClientPortChanged) {
 
   // Verify that the client's ephemeral port is different.
   IPEndPoint new_address = client_->client()->client_address();
-  EXPECT_EQ(old_address.address(), new_address.address());
+  EXPECT_EQ(old_address.address_number(), new_address.address_number());
   EXPECT_NE(old_address.port(), new_address.port());
 }
 
@@ -1790,7 +1793,7 @@ TEST_P(EndToEndTest, ServerSendPublicResetWithDifferentConnectionId) {
   // race conditions.
   server_thread_->Pause();
   server_writer_->WritePacket(packet->data(), packet->length(),
-                              server_address_.address(),
+                              server_address_.address_number(),
                               client_->client()->client_address());
   server_thread_->Resume();
 
@@ -1817,9 +1820,9 @@ TEST_P(EndToEndTest, ClientSendPublicResetWithDifferentConnectionId) {
   QuicFramer framer(server_supported_versions_, QuicTime::Zero(),
                     Perspective::IS_CLIENT);
   scoped_ptr<QuicEncryptedPacket> packet(framer.BuildPublicResetPacket(header));
-  client_writer_->WritePacket(packet->data(), packet->length(),
-                              client_->client()->client_address().address(),
-                              server_address_);
+  client_writer_->WritePacket(
+      packet->data(), packet->length(),
+      client_->client()->client_address().address_number(), server_address_);
 
   // The connection should be unaffected.
   EXPECT_EQ(kFooResponseBody, client_->SendSynchronousRequest("/foo"));
@@ -1845,7 +1848,7 @@ TEST_P(EndToEndTest, ServerSendVersionNegotiationWithDifferentConnectionId) {
   // race conditions.
   server_thread_->Pause();
   server_writer_->WritePacket(packet->data(), packet->length(),
-                              server_address_.address(),
+                              server_address_.address_number(),
                               client_->client()->client_address());
   server_thread_->Resume();
 
@@ -1870,9 +1873,9 @@ TEST_P(EndToEndTest, BadPacketHeaderTruncated) {
                    0x3C,
                    // truncated connection ID
                    0x11};
-  client_writer_->WritePacket(&packet[0], sizeof(packet),
-                              client_->client()->client_address().address(),
-                              server_address_);
+  client_writer_->WritePacket(
+      &packet[0], sizeof(packet),
+      client_->client()->client_address().address_number(), server_address_);
   // Give the server time to process the packet.
   base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(100));
   // Pause the server so we can access the server's internals without races.
@@ -1908,9 +1911,9 @@ TEST_P(EndToEndTest, BadPacketHeaderFlags) {
       // private flags
       0x00,
   };
-  client_writer_->WritePacket(&packet[0], sizeof(packet),
-                              client_->client()->client_address().address(),
-                              server_address_);
+  client_writer_->WritePacket(
+      &packet[0], sizeof(packet),
+      client_->client()->client_address().address_number(), server_address_);
   // Give the server time to process the packet.
   base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(100));
   // Pause the server so we can access the server's internals without races.
@@ -1943,9 +1946,9 @@ TEST_P(EndToEndTest, BadEncryptedData) {
   string damaged_packet(packet->data(), packet->length());
   damaged_packet[30] ^= 0x01;
   DVLOG(1) << "Sending bad packet.";
-  client_writer_->WritePacket(damaged_packet.data(), damaged_packet.length(),
-                              client_->client()->client_address().address(),
-                              server_address_);
+  client_writer_->WritePacket(
+      damaged_packet.data(), damaged_packet.length(),
+      client_->client()->client_address().address_number(), server_address_);
   // Give the server time to process the packet.
   base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(100));
   // This error is sent to the connection's OnError (which ignores it), so the