Make HttpAuthController not reference counted.

net/http/http_proxy_client_socket_pool_unittest.cc

Index: net/http/http_proxy_client_socket_pool_unittest.cc
diff --git a/net/http/http_proxy_client_socket_pool_unittest.cc b/net/http/http_proxy_client_socket_pool_unittest.cc
index 9400dd85b6547efa10f6d934223656469dcecd6f..f5de51597f71c642116beacbc12ba0fe62b2aaaa 100644
--- a/net/http/http_proxy_client_socket_pool_unittest.cc
+++ b/net/http/http_proxy_client_socket_pool_unittest.cc
@@ -32,10 +32,9 @@ class HttpProxyClientSocketPoolTest : public ClientSocketPoolTest {
         notunnel_socket_params_(new HttpProxySocketParams(
               ignored_tcp_socket_params_, GURL("http://host"),
               HostPortPair("host", 80), NULL, false)),
-        auth_controller_(new MockHttpAuthController),
         tunnel_socket_params_(new HttpProxySocketParams(
               ignored_tcp_socket_params_, GURL("http://host"),
-              HostPortPair("host", 80), auth_controller_, true)),
+              HostPortPair("host", 80), NULL, true)),
         http_proxy_histograms_(
             new ClientSocketPoolHistograms("HttpProxyUnitTest")),
         pool_(new HttpProxyClientSocketPool(kMaxSockets, kMaxSocketsPerGroup,
@@ -47,13 +46,19 @@ class HttpProxyClientSocketPoolTest : public ClientSocketPoolTest {
         pool_, group_name, priority, tunnel_socket_params_);
   }
 
+  void SetAuthControllerData(struct MockHttpAuthControllerData* data,
+                             size_t count) {
+    MockHttpAuthController* auth_controller = new MockHttpAuthController;
+    auth_controller->SetMockAuthControllerData(data, count);
+    tunnel_socket_params_->set_auth_controller(auth_controller);
+  }
+
   scoped_refptr<TCPSocketParams> ignored_tcp_socket_params_;
   scoped_refptr<ClientSocketPoolHistograms> tcp_histograms_;
   MockClientSocketFactory tcp_client_socket_factory_;
   scoped_refptr<MockTCPClientSocketPool> tcp_socket_pool_;
 
   scoped_refptr<HttpProxySocketParams> notunnel_socket_params_;
-  scoped_refptr<MockHttpAuthController> auth_controller_;
   scoped_refptr<HttpProxySocketParams> tunnel_socket_params_;
   scoped_refptr<ClientSocketPoolHistograms> http_proxy_histograms_;
   scoped_refptr<HttpProxyClientSocketPool> pool_;
@@ -93,9 +98,9 @@ TEST_F(HttpProxyClientSocketPoolTest, NeedAuth) {
 
   tcp_client_socket_factory_.AddSocketDataProvider(&data);
   MockHttpAuthControllerData auth_data[] = {
-    MockHttpAuthControllerData(""),
+    MockHttpAuthControllerData("", "", ""),
   };
-  auth_controller_->SetMockAuthControllerData(auth_data, arraysize(auth_data));
+  SetAuthControllerData(auth_data, arraysize(auth_data));
 
   ClientSocketHandle handle;
   TestCompletionCallback callback;
@@ -130,9 +135,10 @@ TEST_F(HttpProxyClientSocketPoolTest, HaveAuth) {
 
   tcp_client_socket_factory_.AddSocketDataProvider(&data);
   MockHttpAuthControllerData auth_data[] = {
-    MockHttpAuthControllerData("Proxy-Authorization: Basic Zm9vOmJheg=="),
+    MockHttpAuthControllerData("Proxy-Authorization: Basic Zm9vOmJheg==", "",
+                               ""),
   };
-  auth_controller_->SetMockAuthControllerData(auth_data, arraysize(auth_data));
+  SetAuthControllerData(auth_data, arraysize(auth_data));
 
   ClientSocketHandle handle;
   TestCompletionCallback callback;
@@ -161,9 +167,10 @@ TEST_F(HttpProxyClientSocketPoolTest, AsyncHaveAuth) {
 
   tcp_client_socket_factory_.AddSocketDataProvider(&data);
   MockHttpAuthControllerData auth_data[] = {
-    MockHttpAuthControllerData("Proxy-Authorization: Basic Zm9vOmJheg=="),
+    MockHttpAuthControllerData("Proxy-Authorization: Basic Zm9vOmJheg==", "",
+                               ""),
   };
-  auth_controller_->SetMockAuthControllerData(auth_data, arraysize(auth_data));
+  SetAuthControllerData(auth_data, arraysize(auth_data));
 
   ClientSocketHandle handle;
   TestCompletionCallback callback;
@@ -216,9 +223,10 @@ TEST_F(HttpProxyClientSocketPoolTest, TunnelUnexpectedClose) {
 
   tcp_client_socket_factory_.AddSocketDataProvider(&data);
   MockHttpAuthControllerData auth_data[] = {
-    MockHttpAuthControllerData("Proxy-Authorization: Basic Zm9vOmJheg=="),
+    MockHttpAuthControllerData("Proxy-Authorization: Basic Zm9vOmJheg==", "",
+                               ""),
   };
-  auth_controller_->SetMockAuthControllerData(auth_data, arraysize(auth_data));
+  SetAuthControllerData(auth_data, arraysize(auth_data));
 
   ClientSocketHandle handle;
   TestCompletionCallback callback;
@@ -248,9 +256,10 @@ TEST_F(HttpProxyClientSocketPoolTest, TunnelSetupError) {
 
   tcp_client_socket_factory_.AddSocketDataProvider(&data);
   MockHttpAuthControllerData auth_data[] = {
-    MockHttpAuthControllerData("Proxy-Authorization: Basic Zm9vOmJheg=="),
+    MockHttpAuthControllerData("Proxy-Authorization: Basic Zm9vOmJheg==", "",
+                               ""),
   };
-  auth_controller_->SetMockAuthControllerData(auth_data, arraysize(auth_data));
+  SetAuthControllerData(auth_data, arraysize(auth_data));
 
   ClientSocketHandle handle;
   TestCompletionCallback callback;