* Move the global "DnsResolutionObserver" code depended on by DNS prefetcher,...

net/base/tcp_client_socket_pool_unittest.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/base/tcp_client_socket_pool.h"
 
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "net/base/client_socket.h"
 #include "net/base/client_socket_factory.h"
@@ skipping 214 matching lines @@
   ScopedHostMapper scoped_host_mapper_;
   HostResolver host_resolver_;
   MockClientSocketFactory client_socket_factory_;
   scoped_refptr<ClientSocketPool> pool_;
   std::vector<TestSocketRequest*> request_order_;
 };
 
 TEST_F(TCPClientSocketPoolTest, Basic) {
   TestCompletionCallback callback;
   ClientSocketHandle handle(pool_.get());
-  int rv = handle.Init("a", "www.google.com", 80, 0, &callback);
+  HostResolver::RequestInfo info("www.google.com", 80);
+  int rv = handle.Init("a", info, 0, &callback);
   EXPECT_EQ(ERR_IO_PENDING, rv);
   EXPECT_FALSE(handle.is_initialized());
   EXPECT_FALSE(handle.socket());
 
   EXPECT_EQ(OK, callback.WaitForResult());
   EXPECT_TRUE(handle.is_initialized());
   EXPECT_TRUE(handle.socket());
 
   handle.Reset();
 
   // The handle's Reset method may have posted a task.
   MessageLoop::current()->RunAllPending();
 }
 
 TEST_F(TCPClientSocketPoolTest, InitHostResolutionFailure) {
   RuleBasedHostMapper* host_mapper = new RuleBasedHostMapper;
   host_mapper->AddSimulatedFailure("unresolvable.host.name");
   ScopedHostMapper scoped_host_mapper(host_mapper);
   TestSocketRequest req(pool_.get(), &request_order_);
-  EXPECT_EQ(ERR_IO_PENDING,
-            req.handle.Init("a", "unresolvable.host.name", 80, 5, &req));
+  HostResolver::RequestInfo info("unresolvable.host.name", 80);
+  EXPECT_EQ(ERR_IO_PENDING, req.handle.Init("a", info, 5, &req));
   EXPECT_EQ(ERR_NAME_NOT_RESOLVED, req.WaitForResult());
 }
 
 TEST_F(TCPClientSocketPoolTest, InitConnectionFailure) {
   client_socket_factory_.set_client_socket_type(
       MockClientSocketFactory::MOCK_FAILING_CLIENT_SOCKET);
   TestSocketRequest req(pool_.get(), &request_order_);
+  HostResolver::RequestInfo info("unresolvable.host.name", 80);
   EXPECT_EQ(ERR_IO_PENDING,
-            req.handle.Init("a", "unresolvable.host.name", 80, 5, &req));
+            req.handle.Init("a", info, 5, &req));
   EXPECT_EQ(ERR_CONNECTION_FAILED, req.WaitForResult());
 }
 
 TEST_F(TCPClientSocketPoolTest, PendingRequests) {
   scoped_ptr<TestSocketRequest> reqs[kNumRequests];
 
   for (size_t i = 0; i < arraysize(reqs); ++i)
     reqs[i].reset(new TestSocketRequest(pool_.get(), &request_order_));
 
   // Create connections or queue up requests.
 
   // First request finishes asynchronously.
-  int rv = reqs[0]->handle.Init("a", "www.google.com", 80, 5, reqs[0].get());
+  HostResolver::RequestInfo info("www.google.com", 80);
+  int rv = reqs[0]->handle.Init("a", info, 5, reqs[0].get());
   EXPECT_EQ(ERR_IO_PENDING, rv);
   EXPECT_EQ(OK, reqs[0]->WaitForResult());
 
   // Rest of them finish synchronously, since they're in the HostCache.
   for (int i = 1; i < kMaxSocketsPerGroup; ++i) {
-    rv = reqs[i]->handle.Init("a", "www.google.com", 80, 5, reqs[i].get());
+    rv = reqs[i]->handle.Init("a", info, 5, reqs[i].get());
     EXPECT_EQ(OK, rv);
     request_order_.push_back(reqs[i].get());
   }
 
   // The rest are pending since we've used all active sockets.
   for (int i = 0; i < kNumPendingRequests; ++i) {
     rv = reqs[kMaxSocketsPerGroup + i]->handle.Init(
-        "a", "www.google.com", 80, kPriorities[i],
-        reqs[kMaxSocketsPerGroup + i].get());
+        "a", info, kPriorities[i], reqs[kMaxSocketsPerGroup + i].get());
     EXPECT_EQ(ERR_IO_PENDING, rv);
   }
 
   // Release any connections until we have no connections.
   bool released_one;
   do {
     released_one = false;
     for (size_t i = 0; i < arraysize(reqs); ++i) {
       if (reqs[i]->handle.is_initialized()) {
         reqs[i]->handle.Reset();
@@ skipping 25 matching lines @@
 }
 
 TEST_F(TCPClientSocketPoolTest, PendingRequests_NoKeepAlive) {
   scoped_ptr<TestSocketRequest> reqs[kNumRequests];
   for (size_t i = 0; i < arraysize(reqs); ++i)
     reqs[i].reset(new TestSocketRequest(pool_.get(), &request_order_));
 
   // Create connections or queue up requests.
 
   // First request finishes asynchronously.
-  int rv = reqs[0]->handle.Init("a", "www.google.com", 80, 5, reqs[0].get());
+  HostResolver::RequestInfo info("www.google.com", 80);
+  int rv = reqs[0]->handle.Init("a", info, 5, reqs[0].get());
   EXPECT_EQ(ERR_IO_PENDING, rv);
   EXPECT_EQ(OK, reqs[0]->WaitForResult());
 
   // Rest of them finish synchronously, since they're in the HostCache.
   for (int i = 1; i < kMaxSocketsPerGroup; ++i) {
-    rv = reqs[i]->handle.Init("a", "www.google.com", 80, 5, reqs[i].get());
+    rv = reqs[i]->handle.Init("a", info, 5, reqs[i].get());
     EXPECT_EQ(OK, rv);
     request_order_.push_back(reqs[i].get());
   }
 
   // The rest are pending since we've used all active sockets.
   for (int i = 0; i < kNumPendingRequests; ++i) {
     EXPECT_EQ(ERR_IO_PENDING, reqs[kMaxSocketsPerGroup + i]->handle.Init(
-        "a", "www.google.com", 80, 0, reqs[kMaxSocketsPerGroup + i].get()));
+        "a", info, 0, reqs[kMaxSocketsPerGroup + i].get()));
   }
 
   // Release any connections until we have no connections.
   bool released_one;
   do {
     released_one = false;
     for (size_t i = 0; i < arraysize(reqs); ++i) {
       if (reqs[i]->handle.is_initialized()) {
         reqs[i]->handle.socket()->Disconnect();  // No keep alive.
         reqs[i]->handle.Reset();
         MessageLoop::current()->RunAllPending();
         released_one = true;
       }
     }
   } while (released_one);
 
   for (int i = kMaxSocketsPerGroup; i < kNumRequests; ++i)
     EXPECT_EQ(OK, reqs[i]->WaitForResult());
 
   EXPECT_EQ(kNumRequests, client_socket_factory_.allocation_count());
   EXPECT_EQ(kNumPendingRequests + 1, TestSocketRequest::completion_count);
 }
 
 // This test will start up a RequestSocket() and then immediately Cancel() it.
 // The pending host resolution will eventually complete, and destroy the
 // ClientSocketPool which will crash if the group was not cleared properly.
 TEST_F(TCPClientSocketPoolTest, CancelRequestClearGroup) {
   TestSocketRequest req(pool_.get(), &request_order_);
-  EXPECT_EQ(ERR_IO_PENDING,
-            req.handle.Init("a", "www.google.com", 80, 5, &req));
+  HostResolver::RequestInfo info("www.google.com", 80);
+  EXPECT_EQ(ERR_IO_PENDING, req.handle.Init("a", info, 5, &req));
   req.handle.Reset();
 
   PlatformThread::Sleep(100);
 
   // There is a race condition here.  If the worker pool doesn't post the task
   // before we get here, then this might not run ConnectingSocket::OnIOComplete
   // and therefore leak the canceled ConnectingSocket.  However, other tests
   // after this will call MessageLoop::RunAllPending() which should prevent a
   // leak, unless the worker thread takes longer than all of them.
   MessageLoop::current()->RunAllPending();
 }
 
 TEST_F(TCPClientSocketPoolTest, TwoRequestsCancelOne) {
   TestSocketRequest req(pool_.get(), &request_order_);
   TestSocketRequest req2(pool_.get(), &request_order_);
 
-  EXPECT_EQ(ERR_IO_PENDING,
-            req.handle.Init("a", "www.google.com", 80, 5, &req));
-  EXPECT_EQ(ERR_IO_PENDING,
-            req2.handle.Init("a", "www.google.com", 80, 5, &req2));
+  HostResolver::RequestInfo info("www.google.com", 80);
+  EXPECT_EQ(ERR_IO_PENDING, req.handle.Init("a", info, 5, &req));
+  EXPECT_EQ(ERR_IO_PENDING, req2.handle.Init("a", info, 5, &req2));
 
   req.handle.Reset();
 
   EXPECT_EQ(OK, req2.WaitForResult());
   req2.handle.Reset();
   // The handle's Reset method may have posted a task.
   MessageLoop::current()->RunAllPending();
 }
 
 TEST_F(TCPClientSocketPoolTest, ConnectCancelConnect) {
   client_socket_factory_.set_client_socket_type(
       MockClientSocketFactory::MOCK_PENDING_CLIENT_SOCKET);
   ClientSocketHandle handle(pool_.get());
   TestCompletionCallback callback;
   TestSocketRequest req(pool_.get(), &request_order_);
 
-  EXPECT_EQ(ERR_IO_PENDING,
-            handle.Init("a", "www.google.com", 80, 5, &callback));
+  HostResolver::RequestInfo info("www.google.com", 80);
+  EXPECT_EQ(ERR_IO_PENDING, handle.Init("a", info, 5, &callback));
 
   handle.Reset();
 
   TestCompletionCallback callback2;
-  EXPECT_EQ(ERR_IO_PENDING,
-            handle.Init("a", "www.google.com", 80, 5, &callback2));
+  EXPECT_EQ(ERR_IO_PENDING, handle.Init("a", info, 5, &callback2));
 
   // At this point, handle has two ConnectingSockets out for it.  Due to the
   // host cache, the host resolution for both will return in the same loop of
   // the MessageLoop.  The client socket is a pending socket, so the Connect()
   // will asynchronously complete on the next loop of the MessageLoop.  That
   // means that the first ConnectingSocket will enter OnIOComplete, and then the
   // second one will.  If the first one is not cancelled, it will advance the
   // load state, and then the second one will crash.
 
   EXPECT_EQ(OK, callback2.WaitForResult());
   EXPECT_FALSE(callback.have_result());
 
   handle.Reset();
   // The handle's Reset method may have posted a task.
   MessageLoop::current()->RunAllPending();
 }
 
 TEST_F(TCPClientSocketPoolTest, CancelRequest) {
   scoped_ptr<TestSocketRequest> reqs[kNumRequests];
 
   for (size_t i = 0; i < arraysize(reqs); ++i)
     reqs[i].reset(new TestSocketRequest(pool_.get(), &request_order_));
 
   // Create connections or queue up requests.
+  HostResolver::RequestInfo info("www.google.com", 80);
 
   // First request finishes asynchronously.
-  int rv = reqs[0]->handle.Init("a", "www.google.com", 80, 5, reqs[0].get());
+  int rv = reqs[0]->handle.Init("a", info, 5, reqs[0].get());
   EXPECT_EQ(ERR_IO_PENDING, rv);
   EXPECT_EQ(OK, reqs[0]->WaitForResult());
 
   // Rest of them finish synchronously, since they're in the HostCache.
   for (int i = 1; i < kMaxSocketsPerGroup; ++i) {
-    rv = reqs[i]->handle.Init("a", "www.google.com", 80, 5, reqs[i].get());
+    rv = reqs[i]->handle.Init("a", info, 5, reqs[i].get());
     EXPECT_EQ(OK, rv);
     request_order_.push_back(reqs[i].get());
   }
 
   // The rest are pending since we've used all active sockets.
   for (int i = 0; i < kNumPendingRequests; ++i) {
     EXPECT_EQ(ERR_IO_PENDING, reqs[kMaxSocketsPerGroup + i]->handle.Init(
-        "a", "www.google.com", 80, kPriorities[i],
-        reqs[kMaxSocketsPerGroup + i].get()));
+        "a", info, kPriorities[i], reqs[kMaxSocketsPerGroup + i].get()));
   }
 
   // Cancel a request.
   size_t index_to_cancel = kMaxSocketsPerGroup + 2;
   EXPECT_TRUE(!reqs[index_to_cancel]->handle.is_initialized());
   reqs[index_to_cancel]->handle.Reset();
 
   // Release any connections until we have no connections.
   bool released_one;
   do {
@@ skipping 27 matching lines @@
 
   EXPECT_EQ(request_order_[arraysize(reqs) - 2],
             reqs[arraysize(reqs) - 1].get()) <<
       "The last request with priority 1 should not have been inserted "
       "earlier into the queue.";
 }
 
 }  // namespace
 
 }  // namespace net