net: Pass the real IP address and port for mock TCP sockets where possible.

I'll need that for my upcoming FTP CL.

BUG=131847

Review URL: https://codereview.chromium.org/11280014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168237 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 51 insertions, 46 deletions

diff --git a/net/base/mock_host_resolver.cc b/net/base/mock_host_resolver.cc
index 7dde629..d86e209 100644
--- a/net/base/mock_host_resolver.cc
+++ b/net/base/mock_host_resolver.cc
@@ -121,7 +121,6 @@ HostCache* MockHostResolverBase::GetHostCache() {
 MockHostResolverBase::MockHostResolverBase(bool use_caching)
     : synchronous_mode_(false), next_request_id_(1) {
   rules_ = CreateCatchAllHostResolverProc();
-  proc_ = rules_;
 
   if (use_caching) {
     cache_.reset(new HostCache(kMaxCacheEntries));
@@ -156,11 +155,11 @@ int MockHostResolverBase::ResolveProc(size_t id,
                                       const RequestInfo& info,
                                       AddressList* addresses) {
   AddressList addr;
-  int rv = proc_->Resolve(info.hostname(),
-                          info.address_family(),
-                          info.host_resolver_flags(),
-                          &addr,
-                          NULL);
+  int rv = rules_->Resolve(info.hostname(),
+                           info.address_family(),
+                           info.host_resolver_flags(),
+                           &addr,
+                           NULL);
   if (cache_.get()) {
     HostCache::Key key(info.hostname(),
                        info.address_family(),
diff --git a/net/base/mock_host_resolver.h b/net/base/mock_host_resolver.h
index fff0369..e3b0034 100644
--- a/net/base/mock_host_resolver.h
+++ b/net/base/mock_host_resolver.h
@@ -55,6 +55,7 @@ class MockHostResolverBase : public HostResolver,
   virtual ~MockHostResolverBase();
 
   RuleBasedHostResolverProc* rules() { return rules_; }
+  void set_rules(RuleBasedHostResolverProc* rules) { rules_ = rules; }
 
   // Controls whether resolutions complete synchronously or asynchronously.
   void set_synchronous_mode(bool is_synchronous) {
@@ -91,7 +92,6 @@ class MockHostResolverBase : public HostResolver,
 
   bool synchronous_mode_;
   scoped_refptr<RuleBasedHostResolverProc> rules_;
-  scoped_refptr<HostResolverProc> proc_;
   scoped_ptr<HostCache> cache_;
   RequestMap requests_;
   size_t next_request_id_;
diff --git a/net/ftp/ftp_network_transaction_unittest.cc b/net/ftp/ftp_network_transaction_unittest.cc
index 353e3e1..e4c196f 100644
--- a/net/ftp/ftp_network_transaction_unittest.cc
+++ b/net/ftp/ftp_network_transaction_unittest.cc
@@ -892,9 +892,9 @@ TEST_F(FtpNetworkTransactionTest, DirectoryTransaction) {
 
   EXPECT_TRUE(transaction_.GetResponseInfo()->is_directory_listing);
   EXPECT_EQ(-1, transaction_.GetResponseInfo()->expected_content_size);
-  EXPECT_EQ("192.0.2.33",
+  EXPECT_EQ("127.0.0.1",
             transaction_.GetResponseInfo()->socket_address.host());
-  EXPECT_EQ(0, transaction_.GetResponseInfo()->socket_address.port());
+  EXPECT_EQ(21, transaction_.GetResponseInfo()->socket_address.port());
 }
 
 TEST_F(FtpNetworkTransactionTest, DirectoryTransactionWithPasvFallback) {
@@ -968,9 +968,9 @@ TEST_F(FtpNetworkTransactionTest, DownloadTransaction) {
 
   // We pass an artificial value of 18 as a response to the SIZE command.
   EXPECT_EQ(18, transaction_.GetResponseInfo()->expected_content_size);
-  EXPECT_EQ("192.0.2.33",
+  EXPECT_EQ("127.0.0.1",
             transaction_.GetResponseInfo()->socket_address.host());
-  EXPECT_EQ(0, transaction_.GetResponseInfo()->socket_address.port());
+  EXPECT_EQ(21, transaction_.GetResponseInfo()->socket_address.port());
 }
 
 TEST_F(FtpNetworkTransactionTest, DownloadTransactionWithPasvFallback) {
diff --git a/net/http/http_network_transaction_spdy2_unittest.cc b/net/http/http_network_transaction_spdy2_unittest.cc
index 62700e9..b011285 100644
--- a/net/http/http_network_transaction_spdy2_unittest.cc
+++ b/net/http/http_network_transaction_spdy2_unittest.cc
@@ -259,8 +259,8 @@ class HttpNetworkTransactionSpdy2Test : public PlatformTest {
     }
     out.status_line = response->headers->GetStatusLine();
 
-    EXPECT_EQ("192.0.2.33", response->socket_address.host());
-    EXPECT_EQ(0, response->socket_address.port());
+    EXPECT_EQ("127.0.0.1", response->socket_address.host());
+    EXPECT_EQ(80, response->socket_address.port());
 
     rv = ReadTransaction(trans.get(), &out.response_data);
     EXPECT_EQ(OK, rv);
diff --git a/net/http/http_network_transaction_spdy3_unittest.cc b/net/http/http_network_transaction_spdy3_unittest.cc
index 00e44f7..8faafee 100644
--- a/net/http/http_network_transaction_spdy3_unittest.cc
+++ b/net/http/http_network_transaction_spdy3_unittest.cc
@@ -259,8 +259,8 @@ class HttpNetworkTransactionSpdy3Test : public PlatformTest {
     }
     out.status_line = response->headers->GetStatusLine();
 
-    EXPECT_EQ("192.0.2.33", response->socket_address.host());
-    EXPECT_EQ(0, response->socket_address.port());
+    EXPECT_EQ("127.0.0.1", response->socket_address.host());
+    EXPECT_EQ(80, response->socket_address.port());
 
     rv = ReadTransaction(trans.get(), &out.response_data);
     EXPECT_EQ(OK, rv);
diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc
index 407c543..590a56d 100644
--- a/net/socket/socket_test_util.cc
+++ b/net/socket/socket_test_util.cc
@@ -881,7 +881,11 @@ bool MockTCPClientSocket::IsConnectedAndIdle() const {
 }
 
 int MockTCPClientSocket::GetPeerAddress(IPEndPoint* address) const {
-  return MockClientSocket::GetPeerAddress(address);
+  if (addresses_.empty())
+    return MockClientSocket::GetPeerAddress(address);
+
+  *address = addresses_[0];
+  return OK;
 }
 
 bool MockTCPClientSocket::WasEverUsed() const {
diff --git a/net/spdy/spdy_network_transaction_spdy2_unittest.cc b/net/spdy/spdy_network_transaction_spdy2_unittest.cc
index dc985f7..6beb93c 100644
--- a/net/spdy/spdy_network_transaction_spdy2_unittest.cc
+++ b/net/spdy/spdy_network_transaction_spdy2_unittest.cc
@@ -78,24 +78,24 @@ class SpdyNetworkTransactionSpdy2Test
                                 SpdySessionDependencies* session_deps)
         : request_(request),
           session_deps_(session_deps == NULL ?
-              new SpdySessionDependencies() : session_deps),
+                        new SpdySessionDependencies() : session_deps),
           session_(SpdySessionDependencies::SpdyCreateSession(
-              session_deps_.get())),
+                       session_deps_.get())),
           log_(log),
           test_type_(test_type),
           deterministic_(false),
           spdy_enabled_(true) {
-            switch (test_type_) {
-              case SPDYNOSSL:
-              case SPDYSSL:
-                port_ = 80;
-                break;
-              case SPDYNPN:
-                port_ = 443;
-                break;
-              default:
-                NOTREACHED();
-            }
+      switch (test_type_) {
+        case SPDYNOSSL:
+        case SPDYSSL:
+          port_ = 80;
+          break;
+        case SPDYNPN:
+          port_ = 443;
+          break;
+        default:
+          NOTREACHED();
+      }
     }
 
     ~NormalSpdyTransactionHelper() {
@@ -118,6 +118,7 @@ class SpdyNetworkTransactionSpdy2Test
 
     void SetSpdyDisabled() {
       spdy_enabled_ = false;
+      port_ = 80;
     }
 
     void RunPreTestSetup() {
@@ -190,8 +191,8 @@ class SpdyNetworkTransactionSpdy2Test
         EXPECT_EQ(request_.url.SchemeIs("https"),
                   response->was_npn_negotiated);
       }
-      EXPECT_EQ("192.0.2.33", response->socket_address.host());
-      EXPECT_EQ(0, response->socket_address.port());
+      EXPECT_EQ("127.0.0.1", response->socket_address.host());
+      EXPECT_EQ(port_, response->socket_address.port());
       output_.status_line = response->headers->GetStatusLine();
       output_.response_info = *response;  // Make a copy so we can verify.
       output_.rv = ReadTransaction(trans_.get(), &output_.response_data);
diff --git a/net/spdy/spdy_network_transaction_spdy3_unittest.cc b/net/spdy/spdy_network_transaction_spdy3_unittest.cc
index 89e5150..50ccbb0 100644
--- a/net/spdy/spdy_network_transaction_spdy3_unittest.cc
+++ b/net/spdy/spdy_network_transaction_spdy3_unittest.cc
@@ -78,24 +78,24 @@ class SpdyNetworkTransactionSpdy3Test
                                 SpdySessionDependencies* session_deps)
         : request_(request),
           session_deps_(session_deps == NULL ?
-              new SpdySessionDependencies() : session_deps),
+                        new SpdySessionDependencies() : session_deps),
           session_(SpdySessionDependencies::SpdyCreateSession(
-              session_deps_.get())),
+                       session_deps_.get())),
           log_(log),
           test_type_(test_type),
           deterministic_(false),
           spdy_enabled_(true) {
-            switch (test_type_) {
-              case SPDYNOSSL:
-              case SPDYSSL:
-                port_ = 80;
-                break;
-              case SPDYNPN:
-                port_ = 443;
-                break;
-              default:
-                NOTREACHED();
-            }
+      switch (test_type_) {
+        case SPDYNOSSL:
+        case SPDYSSL:
+          port_ = 80;
+          break;
+        case SPDYNPN:
+          port_ = 443;
+          break;
+        default:
+          NOTREACHED();
+      }
     }
 
     ~NormalSpdyTransactionHelper() {
@@ -118,6 +118,7 @@ class SpdyNetworkTransactionSpdy3Test
 
     void SetSpdyDisabled() {
       spdy_enabled_ = false;
+      port_ = 80;
     }
 
     void RunPreTestSetup() {
@@ -191,8 +192,8 @@ class SpdyNetworkTransactionSpdy3Test
         EXPECT_EQ(request_.url.SchemeIs("https"),
                   response->was_npn_negotiated);
       }
-      EXPECT_EQ("192.0.2.33", response->socket_address.host());
-      EXPECT_EQ(0, response->socket_address.port());
+      EXPECT_EQ("127.0.0.1", response->socket_address.host());
+      EXPECT_EQ(port_, response->socket_address.port());
       output_.status_line = response->headers->GetStatusLine();
       output_.response_info = *response;  // Make a copy so we can verify.
       output_.rv = ReadTransaction(trans_.get(), &output_.response_data);