Refactorings surrounding HostResolver:...

net/socket/socks5_client_socket_unittest.cc

 // Copyright (c) 2009 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/socket/socks5_client_socket.h"
 
 #include <map>
 #include "build/build_config.h"
 #if defined(OS_WIN)
 #include <ws2tcpip.h>
 #elif defined(OS_POSIX)
 #include <netdb.h>
 #endif
 #include "net/base/address_list.h"
-#include "net/base/host_resolver_unittest.h"
+#include "net/base/mock_host_resolver.h"
 #include "net/base/test_completion_callback.h"
 #include "net/base/winsock_init.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/socket/socket_test_util.h"
 #include "net/socket/tcp_client_socket.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 //-----------------------------------------------------------------------------
 
 namespace net {
 
 // Base class to test SOCKS5ClientSocket
 class SOCKS5ClientSocketTest : public PlatformTest {
  public:
   SOCKS5ClientSocketTest();
   // Create a SOCKSClientSocket on top of a MockSocket.
   SOCKS5ClientSocket* BuildMockSocket(MockRead reads[],
                                       MockWrite writes[],
                                       const std::string& hostname,
                                       int port);
   virtual void SetUp();
 
  protected:
   const uint16 kNwPort;
   scoped_ptr<SOCKS5ClientSocket> user_sock_;
   AddressList address_list_;
   ClientSocket* tcp_sock_;
-  ScopedHostMapper host_mapper_;
   TestCompletionCallback callback_;
-  scoped_refptr<RuleBasedHostMapper> mapper_;
-  scoped_refptr<HostResolver> host_resolver_;
+  scoped_refptr<MockHostResolver> host_resolver_;
   scoped_ptr<MockSocket> mock_socket_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SOCKS5ClientSocketTest);
 };
 
 SOCKS5ClientSocketTest::SOCKS5ClientSocketTest()
-  : kNwPort(htons(80)), host_resolver_(new HostResolver(0, 0)) {
+  : kNwPort(htons(80)), host_resolver_(new MockHostResolver) {
 }
 
 // Set up platform before every test case
 void SOCKS5ClientSocketTest::SetUp() {
   PlatformTest::SetUp();
 
   // Resolve the "localhost" AddressList used by the TCP connection to connect.
-  scoped_refptr<HostResolver> resolver = new HostResolver();
   HostResolver::RequestInfo info("www.socks-proxy.com", 1080);
-  int rv = resolver->Resolve(info, &address_list_, NULL, NULL);
+  int rv = host_resolver_->Resolve(info, &address_list_, NULL, NULL);
   ASSERT_EQ(OK, rv);
-
-  // Create a new host mapping for the duration of this test case only.
-  mapper_ = new RuleBasedHostMapper();
-  host_mapper_.Init(mapper_);
 }
 
 SOCKS5ClientSocket* SOCKS5ClientSocketTest::BuildMockSocket(
     MockRead reads[],
     MockWrite writes[],
     const std::string& hostname,
     int port) {
 
   TestCompletionCallback callback;
   mock_socket_.reset(new StaticMockSocket(reads, writes));
@@ skipping 65 matching lines @@
   user_sock_->Disconnect();
   EXPECT_FALSE(tcp_sock_->IsConnected());
   EXPECT_FALSE(user_sock_->IsConnected());
 }
 
 // Tries to connect to a DNS which fails domain lookup.
 TEST_F(SOCKS5ClientSocketTest, FailedDNS) {
   const std::string hostname = "unresolved.ipv4.address";
   const char kSOCKS5DomainRequest[] = { 0x05, 0x01, 0x00, 0x03 };
 
-  mapper_->AddSimulatedFailure(hostname.c_str());
+  host_resolver_->rules()->AddSimulatedFailure(hostname.c_str());
 
   std::string request(kSOCKS5DomainRequest,
                       arraysize(kSOCKS5DomainRequest));
   request.push_back(hostname.size());
   request.append(hostname);
   request.append(reinterpret_cast<const char*>(&kNwPort), sizeof(kNwPort));
 
   MockWrite data_writes[] = {
       MockWrite(false, kSOCKS5GreetRequest, arraysize(kSOCKS5GreetRequest)),
       MockWrite(false, request.data(), request.size()) };
@@ skipping 12 matching lines @@
             user_sock_->address_type_);
 }
 
 // Tries to connect to a domain that resolves to IPv6.
 TEST_F(SOCKS5ClientSocketTest, IPv6Domain) {
   const std::string hostname = "an.ipv6.address";
   const char kSOCKS5IPv6Request[] = { 0x05, 0x01, 0x00, 0x04 };
   const uint8 ipv6_addr[] = { 0x20, 0x01, 0x0d, 0xb8, 0x87, 0x14, 0x3a, 0x90,
                               0x00, 0x00, 0x00, 0x00, 0x00, 0x000, 0x00, 0x12 };
 
-  mapper_->AddRule(hostname.c_str(), "2001:db8:8714:3a90::12");
+  host_resolver_->rules()->AddRule(hostname, "2001:db8:8714:3a90::12");
 
   AddressList address_list;
-  scoped_refptr<HostResolver> resolver = new HostResolver();
   HostResolver::RequestInfo info(hostname, 80);
-  int rv = resolver->Resolve(info, &address_list, NULL, NULL);
+  int rv = host_resolver_->Resolve(info, &address_list, NULL, NULL);
   if (rv != OK || !address_list.head()) {
     // This machine does not support IPv6. We skip this test altogether.
     // TODO(arindam): create a MockIPv6HostResolver to manually
     // populate the |address_list| in case of a machine with no IPv6 suppport.
     return;
   }
 
   std::string request(kSOCKS5IPv6Request,
                       arraysize(kSOCKS5IPv6Request));
   request.append(reinterpret_cast<const char*>(&ipv6_addr), sizeof(ipv6_addr));
@@ skipping 92 matching lines @@
     int rv = user_sock_->Connect(&callback_);
     EXPECT_EQ(ERR_IO_PENDING, rv);
     rv = callback_.WaitForResult();
     EXPECT_EQ(OK, rv);
     EXPECT_TRUE(user_sock_->IsConnected());
   }
 }
 
 }  // namespace net