Temporarily landing my ClientSocketPool refactor. Will revert right after.

Review URL: http://codereview.chromium.org/113759

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

1 files changed, 114 insertions, 63 deletions

diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
index 3d5fb44..e583f0b 100644
--- a/net/http/http_network_transaction_unittest.cc
+++ b/net/http/http_network_transaction_unittest.cc
@@ -351,8 +351,9 @@ ProxyService* CreateFixedProxyService(const std::string& proxy) {
 }
 
 
-HttpNetworkSession* CreateSession(ProxyService* proxy_service) {
-  return new HttpNetworkSession(proxy_service);
+HttpNetworkSession* CreateSession(ProxyService* proxy_service,
+                                  ClientSocketFactory* client_socket_factory) {
+  return new HttpNetworkSession(proxy_service, client_socket_factory);
 }
 
 class HttpNetworkTransactionTest : public PlatformTest {
@@ -384,8 +385,10 @@ SimpleGetHelperResult SimpleGetHelper(MockRead data_reads[]) {
   SimpleGetHelperResult out;
 
   scoped_ptr<ProxyService> proxy_service(CreateNullProxyService());
-  scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(
-      CreateSession(proxy_service.get()), &mock_socket_factory));
+  scoped_ptr<HttpTransaction> trans(
+      new HttpNetworkTransaction(
+          CreateSession(proxy_service.get(), &mock_socket_factory),
+          &mock_socket_factory));
 
   HttpRequestInfo request;
   request.method = "GET";
@@ -466,8 +469,10 @@ std::string MockGetHostName() {
 
 TEST_F(HttpNetworkTransactionTest, Basic) {
   scoped_ptr<ProxyService> proxy_service(CreateNullProxyService());
-  scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(
-      CreateSession(proxy_service.get()), &mock_socket_factory));
+  scoped_ptr<HttpTransaction> trans(
+      new HttpNetworkTransaction(
+          CreateSession(proxy_service.get(), &mock_socket_factory),
+          &mock_socket_factory));
 }
 
 TEST_F(HttpNetworkTransactionTest, SimpleGET) {
@@ -577,8 +582,10 @@ TEST_F(HttpNetworkTransactionTest, StopsReading204) {
 // message body (since HEAD has none).
 TEST_F(HttpNetworkTransactionTest, Head) {
   scoped_ptr<ProxyService> proxy_service(CreateNullProxyService());
-  scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(
-      CreateSession(proxy_service.get()), &mock_socket_factory));
+  scoped_ptr<HttpTransaction> trans(
+      new HttpNetworkTransaction(
+          CreateSession(proxy_service.get(), &mock_socket_factory),
+          &mock_socket_factory));
 
   HttpRequestInfo request;
   request.method = "HEAD";
@@ -640,7 +647,7 @@ TEST_F(HttpNetworkTransactionTest, Head) {
 TEST_F(HttpNetworkTransactionTest, ReuseConnection) {
   scoped_ptr<ProxyService> proxy_service(CreateNullProxyService());
   scoped_refptr<HttpNetworkSession> session =
-      CreateSession(proxy_service.get());
+      CreateSession(proxy_service.get(), &mock_socket_factory);
 
   MockRead data_reads[] = {
     MockRead("HTTP/1.1 200 OK\r\nContent-Length: 5\r\n\r\n"),
@@ -690,8 +697,10 @@ TEST_F(HttpNetworkTransactionTest, ReuseConnection) {
 
 TEST_F(HttpNetworkTransactionTest, Ignores100) {
   scoped_ptr<ProxyService> proxy_service(CreateNullProxyService());
-  scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(
-      CreateSession(proxy_service.get()), &mock_socket_factory));
+  scoped_ptr<HttpTransaction> trans(
+      new HttpNetworkTransaction(
+          CreateSession(proxy_service.get(), &mock_socket_factory),
+          &mock_socket_factory));
 
   HttpRequestInfo request;
   request.method = "POST";
@@ -736,8 +745,10 @@ TEST_F(HttpNetworkTransactionTest, Ignores100) {
 // HTTP/1.1.
 TEST_F(HttpNetworkTransactionTest, Ignores1xx) {
   scoped_ptr<ProxyService> proxy_service(CreateNullProxyService());
-  scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(
-      CreateSession(proxy_service.get()), &mock_socket_factory));
+  scoped_ptr<HttpTransaction> trans(
+      new HttpNetworkTransaction(
+          CreateSession(proxy_service.get(), &mock_socket_factory),
+          &mock_socket_factory));
 
   HttpRequestInfo request;
   request.method = "GET";
@@ -781,7 +792,7 @@ void HttpNetworkTransactionTest::KeepAliveConnectionResendRequestTest(
     const MockRead& read_failure) {
   scoped_ptr<ProxyService> proxy_service(CreateNullProxyService());
   scoped_refptr<HttpNetworkSession> session =
-      CreateSession(proxy_service.get());
+      CreateSession(proxy_service.get(), &mock_socket_factory);
 
   HttpRequestInfo request;
   request.method = "GET";
@@ -847,8 +858,10 @@ TEST_F(HttpNetworkTransactionTest, KeepAliveConnectionEOF) {
 
 TEST_F(HttpNetworkTransactionTest, NonKeepAliveConnectionReset) {
   scoped_ptr<ProxyService> proxy_service(CreateNullProxyService());
-  scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(
-      CreateSession(proxy_service.get()), &mock_socket_factory));
+  scoped_ptr<HttpTransaction> trans(
+      new HttpNetworkTransaction(
+          CreateSession(proxy_service.get(), &mock_socket_factory),
+          &mock_socket_factory));
 
   HttpRequestInfo request;
   request.method = "GET";
@@ -902,8 +915,10 @@ TEST_F(HttpNetworkTransactionTest, NonKeepAliveConnectionEOF) {
 // (basic auth is the easiest to mock, because it has no randomness).
 TEST_F(HttpNetworkTransactionTest, BasicAuth) {
   scoped_ptr<ProxyService> proxy_service(CreateNullProxyService());
-  scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(
-      CreateSession(proxy_service.get()), &mock_socket_factory));
+  scoped_ptr<HttpTransaction> trans(
+      new HttpNetworkTransaction(
+          CreateSession(proxy_service.get(), &mock_socket_factory),
+          &mock_socket_factory));
 
   HttpRequestInfo request;
   request.method = "GET";
@@ -992,8 +1007,10 @@ TEST_F(HttpNetworkTransactionTest, BasicAuth) {
 // connection.
 TEST_F(HttpNetworkTransactionTest, BasicAuthKeepAlive) {
   scoped_ptr<ProxyService> proxy_service(CreateNullProxyService());
-  scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(
-      CreateSession(proxy_service.get()), &mock_socket_factory));
+  scoped_ptr<HttpTransaction> trans(
+      new HttpNetworkTransaction(
+          CreateSession(proxy_service.get(), &mock_socket_factory),
+          &mock_socket_factory));
 
   HttpRequestInfo request;
   request.method = "GET";
@@ -1069,8 +1086,10 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthKeepAlive) {
 // connection and with no response body to drain.
 TEST_F(HttpNetworkTransactionTest, BasicAuthKeepAliveNoBody) {
   scoped_ptr<ProxyService> proxy_service(CreateNullProxyService());
-  scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(
-      CreateSession(proxy_service.get()), &mock_socket_factory));
+  scoped_ptr<HttpTransaction> trans(
+      new HttpNetworkTransaction(
+          CreateSession(proxy_service.get(), &mock_socket_factory),
+          &mock_socket_factory));
 
   HttpRequestInfo request;
   request.method = "GET";
@@ -1149,8 +1168,10 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthKeepAliveNoBody) {
 // connection and with a large response body to drain.
 TEST_F(HttpNetworkTransactionTest, BasicAuthKeepAliveLargeBody) {
   scoped_ptr<ProxyService> proxy_service(CreateNullProxyService());
-  scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(
-      CreateSession(proxy_service.get()), &mock_socket_factory));
+  scoped_ptr<HttpTransaction> trans(
+      new HttpNetworkTransaction(
+          CreateSession(proxy_service.get(), &mock_socket_factory),
+          &mock_socket_factory));
 
   HttpRequestInfo request;
   request.method = "GET";
@@ -1236,7 +1257,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthProxyKeepAlive) {
       CreateFixedProxyService("myproxy:70"));
 
   scoped_refptr<HttpNetworkSession> session(
-      CreateSession(proxy_service.get()));
+      CreateSession(proxy_service.get(), &mock_socket_factory));
 
   scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(
       session.get(), &mock_socket_factory));
@@ -1337,7 +1358,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthProxyCancelTunnel) {
       CreateFixedProxyService("myproxy:70"));
 
   scoped_refptr<HttpNetworkSession> session(
-      CreateSession(proxy_service.get()));
+      CreateSession(proxy_service.get(), &mock_socket_factory));
 
   scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(
       session.get(), &mock_socket_factory));
@@ -1395,7 +1416,7 @@ static void ConnectStatusHelperWithExpectedStatus(
       CreateFixedProxyService("myproxy:70"));
 
   scoped_refptr<HttpNetworkSession> session(
-      CreateSession(proxy_service.get()));
+      CreateSession(proxy_service.get(), &mock_socket_factory));
 
   scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(
       session.get(), &mock_socket_factory));
@@ -1611,7 +1632,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthProxyThenServer) {
 
   // Configure against proxy server "myproxy:70".
   scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(
-      CreateSession(proxy_service.get()),
+      CreateSession(proxy_service.get(), &mock_socket_factory),
       &mock_socket_factory));
 
   HttpRequestInfo request;
@@ -1749,8 +1770,10 @@ TEST_F(HttpNetworkTransactionTest, NTLMAuth1) {
                                                          MockGetHostName);
 
   scoped_ptr<ProxyService> proxy_service(CreateNullProxyService());
-  scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(
-      CreateSession(proxy_service.get()), &mock_socket_factory));
+  scoped_ptr<HttpTransaction> trans(
+      new HttpNetworkTransaction(
+          CreateSession(proxy_service.get(), &mock_socket_factory),
+          &mock_socket_factory));
 
   HttpRequestInfo request;
   request.method = "GET";
@@ -1876,8 +1899,10 @@ TEST_F(HttpNetworkTransactionTest, NTLMAuth2) {
                                                          MockGetHostName);
 
   scoped_ptr<ProxyService> proxy_service(CreateNullProxyService());
-  scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(
-      CreateSession(proxy_service.get()), &mock_socket_factory));
+  scoped_ptr<HttpTransaction> trans(
+      new HttpNetworkTransaction(
+          CreateSession(proxy_service.get(), &mock_socket_factory),
+          &mock_socket_factory));
 
   HttpRequestInfo request;
   request.method = "GET";
@@ -2083,8 +2108,10 @@ TEST_F(HttpNetworkTransactionTest, NTLMAuth2) {
 // fail with ERR_RESPONSE_HEADERS_TOO_BIG.
 TEST_F(HttpNetworkTransactionTest, LargeHeadersNoBody) {
   scoped_ptr<ProxyService> proxy_service(CreateNullProxyService());
-  scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(
-      CreateSession(proxy_service.get()), &mock_socket_factory));
+  scoped_ptr<HttpTransaction> trans(
+      new HttpNetworkTransaction(
+          CreateSession(proxy_service.get(), &mock_socket_factory),
+          &mock_socket_factory));
 
   HttpRequestInfo request;
   request.method = "GET";
@@ -2127,7 +2154,7 @@ TEST_F(HttpNetworkTransactionTest, DontRecycleTCPSocketForSSLTunnel) {
       CreateFixedProxyService("myproxy:70"));
 
   scoped_refptr<HttpNetworkSession> session(
-      CreateSession(proxy_service.get()));
+      CreateSession(proxy_service.get(), &mock_socket_factory));
 
   scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(
       session.get(), &mock_socket_factory));
@@ -2186,7 +2213,7 @@ TEST_F(HttpNetworkTransactionTest, DontRecycleTCPSocketForSSLTunnel) {
 TEST_F(HttpNetworkTransactionTest, RecycleSocket) {
   scoped_ptr<ProxyService> proxy_service(CreateNullProxyService());
   scoped_refptr<HttpNetworkSession> session(
-      CreateSession(proxy_service.get()));
+      CreateSession(proxy_service.get(), &mock_socket_factory));
 
   scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(
       session.get(), &mock_socket_factory));
@@ -2246,7 +2273,7 @@ TEST_F(HttpNetworkTransactionTest, RecycleSocket) {
 TEST_F(HttpNetworkTransactionTest, RecycleSocketAfterZeroContentLength) {
   scoped_ptr<ProxyService> proxy_service(CreateNullProxyService());
   scoped_refptr<HttpNetworkSession> session(
-      CreateSession(proxy_service.get()));
+      CreateSession(proxy_service.get(), &mock_socket_factory));
 
   scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(
       session.get(), &mock_socket_factory));
@@ -2321,7 +2348,7 @@ TEST_F(HttpNetworkTransactionTest, ResendRequestOnWriteBodyError) {
 
   scoped_ptr<ProxyService> proxy_service(CreateNullProxyService());
   scoped_refptr<HttpNetworkSession> session =
-      CreateSession(proxy_service.get());
+      CreateSession(proxy_service.get(), &mock_socket_factory);
 
   // The first socket is used for transaction 1 and the first attempt of
   // transaction 2.
@@ -2398,8 +2425,10 @@ TEST_F(HttpNetworkTransactionTest, ResendRequestOnWriteBodyError) {
 // it fails the identity from the URL is used to answer the challenge.
 TEST_F(HttpNetworkTransactionTest, AuthIdentityInUrl) {
   scoped_ptr<ProxyService> proxy_service(CreateNullProxyService());
-  scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(
-      CreateSession(proxy_service.get()), &mock_socket_factory));
+  scoped_ptr<HttpTransaction> trans(
+      new HttpNetworkTransaction(
+          CreateSession(proxy_service.get(), &mock_socket_factory),
+          &mock_socket_factory));
 
   HttpRequestInfo request;
   request.method = "GET";
@@ -2477,7 +2506,7 @@ TEST_F(HttpNetworkTransactionTest, AuthIdentityInUrl) {
 TEST_F(HttpNetworkTransactionTest, BasicAuthCacheAndPreauth) {
   scoped_ptr<ProxyService> proxy_service(CreateNullProxyService());
   scoped_refptr<HttpNetworkSession> session =
-      CreateSession(proxy_service.get());
+      CreateSession(proxy_service.get(), &mock_socket_factory);
 
   // Transaction 1: authenticate (foo, bar) on MyRealm1
   {
@@ -2895,8 +2924,10 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthCacheAndPreauth) {
 TEST_F(HttpNetworkTransactionTest, ResetStateForRestart) {
   // Create a transaction (the dependencies aren't important).
   scoped_ptr<ProxyService> proxy_service(CreateNullProxyService());
-  scoped_ptr<HttpNetworkTransaction> trans(new HttpNetworkTransaction(
-      CreateSession(proxy_service.get()), &mock_socket_factory));
+  scoped_ptr<HttpNetworkTransaction> trans(
+      new HttpNetworkTransaction(
+          CreateSession(proxy_service.get(), &mock_socket_factory),
+          &mock_socket_factory));
 
   // Setup some state (which we expect ResetStateForRestart() will clear).
   trans->header_buf_->Realloc(10);
@@ -2953,8 +2984,10 @@ TEST_F(HttpNetworkTransactionTest, ResetStateForRestart) {
 // Test HTTPS connections to a site with a bad certificate
 TEST_F(HttpNetworkTransactionTest, HTTPSBadCertificate) {
   scoped_ptr<ProxyService> proxy_service(CreateNullProxyService());
-  scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(
-      CreateSession(proxy_service.get()), &mock_socket_factory));
+  scoped_ptr<HttpTransaction> trans(
+      new HttpNetworkTransaction(
+          CreateSession(proxy_service.get(), &mock_socket_factory),
+          &mock_socket_factory));
 
   HttpRequestInfo request;
   request.method = "GET";
@@ -3063,8 +3096,10 @@ TEST_F(HttpNetworkTransactionTest, HTTPSBadCertificateViaProxy) {
     mock_sockets_index = 0;
     mock_ssl_sockets_index = 0;
 
-    scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(
-        CreateSession(proxy_service.get()), &mock_socket_factory));
+    scoped_ptr<HttpTransaction> trans(
+        new HttpNetworkTransaction(
+            CreateSession(proxy_service.get(), &mock_socket_factory),
+            &mock_socket_factory));
 
     int rv = trans->Start(&request, &callback);
     EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -3087,8 +3122,10 @@ TEST_F(HttpNetworkTransactionTest, HTTPSBadCertificateViaProxy) {
 
 TEST_F(HttpNetworkTransactionTest, BuildRequest_UserAgent) {
   scoped_ptr<ProxyService> proxy_service(CreateNullProxyService());
-  scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(
-      CreateSession(proxy_service.get()), &mock_socket_factory));
+  scoped_ptr<HttpTransaction> trans(
+      new HttpNetworkTransaction(
+          CreateSession(proxy_service.get(), &mock_socket_factory),
+          &mock_socket_factory));
 
   HttpRequestInfo request;
   request.method = "GET";
@@ -3127,8 +3164,10 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_UserAgent) {
 
 TEST_F(HttpNetworkTransactionTest, BuildRequest_Referer) {
   scoped_ptr<ProxyService> proxy_service(CreateNullProxyService());
-  scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(
-      CreateSession(proxy_service.get()), &mock_socket_factory));
+  scoped_ptr<HttpTransaction> trans(
+      new HttpNetworkTransaction(
+          CreateSession(proxy_service.get(), &mock_socket_factory),
+          &mock_socket_factory));
 
   HttpRequestInfo request;
   request.method = "GET";
@@ -3168,8 +3207,10 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_Referer) {
 
 TEST_F(HttpNetworkTransactionTest, BuildRequest_PostContentLengthZero) {
   scoped_ptr<ProxyService> proxy_service(CreateNullProxyService());
-  scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(
-      CreateSession(proxy_service.get()), &mock_socket_factory));
+  scoped_ptr<HttpTransaction> trans(
+      new HttpNetworkTransaction(
+          CreateSession(proxy_service.get(), &mock_socket_factory),
+          &mock_socket_factory));
 
   HttpRequestInfo request;
   request.method = "POST";
@@ -3207,8 +3248,10 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_PostContentLengthZero) {
 
 TEST_F(HttpNetworkTransactionTest, BuildRequest_PutContentLengthZero) {
   scoped_ptr<ProxyService> proxy_service(CreateNullProxyService());
-  scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(
-      CreateSession(proxy_service.get()), &mock_socket_factory));
+  scoped_ptr<HttpTransaction> trans(
+      new HttpNetworkTransaction(
+          CreateSession(proxy_service.get(), &mock_socket_factory),
+          &mock_socket_factory));
 
   HttpRequestInfo request;
   request.method = "PUT";
@@ -3246,8 +3289,10 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_PutContentLengthZero) {
 
 TEST_F(HttpNetworkTransactionTest, BuildRequest_HeadContentLengthZero) {
   scoped_ptr<ProxyService> proxy_service(CreateNullProxyService());
-  scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(
-      CreateSession(proxy_service.get()), &mock_socket_factory));
+  scoped_ptr<HttpTransaction> trans(
+      new HttpNetworkTransaction(
+          CreateSession(proxy_service.get(), &mock_socket_factory),
+          &mock_socket_factory));
 
   HttpRequestInfo request;
   request.method = "HEAD";
@@ -3285,8 +3330,10 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_HeadContentLengthZero) {
 
 TEST_F(HttpNetworkTransactionTest, BuildRequest_CacheControlNoCache) {
   scoped_ptr<ProxyService> proxy_service(CreateNullProxyService());
-  scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(
-      CreateSession(proxy_service.get()), &mock_socket_factory));
+  scoped_ptr<HttpTransaction> trans(
+      new HttpNetworkTransaction(
+          CreateSession(proxy_service.get(), &mock_socket_factory),
+          &mock_socket_factory));
 
   HttpRequestInfo request;
   request.method = "GET";
@@ -3327,8 +3374,10 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_CacheControlNoCache) {
 TEST_F(HttpNetworkTransactionTest,
        BuildRequest_CacheControlValidateCache) {
   scoped_ptr<ProxyService> proxy_service(CreateNullProxyService());
-  scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(
-      CreateSession(proxy_service.get()), &mock_socket_factory));
+  scoped_ptr<HttpTransaction> trans(
+      new HttpNetworkTransaction(
+          CreateSession(proxy_service.get(), &mock_socket_factory),
+          &mock_socket_factory));
 
   HttpRequestInfo request;
   request.method = "GET";
@@ -3367,8 +3416,10 @@ TEST_F(HttpNetworkTransactionTest,
 
 TEST_F(HttpNetworkTransactionTest, BuildRequest_ExtraHeaders) {
   scoped_ptr<ProxyService> proxy_service(CreateNullProxyService());
-  scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(
-      CreateSession(proxy_service.get()), &mock_socket_factory));
+  scoped_ptr<HttpTransaction> trans(
+      new HttpNetworkTransaction(
+          CreateSession(proxy_service.get(), &mock_socket_factory),
+          &mock_socket_factory));
 
   HttpRequestInfo request;
   request.method = "GET";