Refactorings surrounding HostResolver:...

net/ftp/ftp_network_transaction_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/ftp/ftp_network_transaction.h"
 
 #include "base/ref_counted.h"
-#include "net/base/host_resolver.h"
-#include "net/base/host_resolver_unittest.h"
 #include "net/base/io_buffer.h"
+#include "net/base/mock_host_resolver.h"
 #include "net/base/test_completion_callback.h"
 #include "net/ftp/ftp_network_session.h"
 #include "net/ftp/ftp_request_info.h"
 #include "net/socket/socket_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 namespace {
 
 // Size we use for IOBuffers used to receive data from the test data socket.
@@ skipping 209 matching lines @@
     }
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FtpMockControlSocketFileDownloadRetrFail);
 };
 
 class FtpNetworkTransactionTest : public PlatformTest {
  public:
   FtpNetworkTransactionTest()
-      : session_(new FtpNetworkSession(new HostResolver)),
+      : host_resolver_(new MockHostResolver),
+        session_(new FtpNetworkSession(host_resolver_)),
         transaction_(session_.get(), &mock_socket_factory_) {
   }
 
  protected:
   FtpRequestInfo GetRequestInfo(const std::string& url) {
     FtpRequestInfo info;
     info.url = GURL(url);
     return info;
   }
 
@@ skipping 28 matching lines @@
   void TransactionFailHelper(FtpMockControlSocket* ctrl_socket,
                              const char* request,
                              FtpMockControlSocket::State state,
                              FtpMockControlSocket::State next_state,
                              const char* response,
                              int expected_result) {
     ctrl_socket->InjectFailure(state, next_state, response);
     ExecuteTransaction(ctrl_socket, request, expected_result);
   }
 
+  scoped_refptr<MockHostResolver> host_resolver_;
   scoped_refptr<FtpNetworkSession> session_;
   MockClientSocketFactory mock_socket_factory_;
   FtpNetworkTransaction transaction_;
   TestCompletionCallback callback_;
 };
 
 TEST_F(FtpNetworkTransactionTest, FailedLookup) {
   FtpRequestInfo request_info = GetRequestInfo("ftp://badhost");
-  scoped_refptr<RuleBasedHostMapper> mapper(new RuleBasedHostMapper());
-  mapper->AddSimulatedFailure("badhost");
-  ScopedHostMapper scoped_mapper(mapper.get());
+  host_resolver_->rules()->AddSimulatedFailure("badhost");
   ASSERT_EQ(ERR_IO_PENDING, transaction_.Start(&request_info, &callback_));
   EXPECT_EQ(ERR_FAILED, callback_.WaitForResult());
 }
 
 TEST_F(FtpNetworkTransactionTest, DirectoryTransaction) {
   FtpMockControlSocketDirectoryListing ctrl_socket;
   ExecuteTransaction(&ctrl_socket, "ftp://host", OK);
 }
 
 TEST_F(FtpNetworkTransactionTest, DirectoryTransactionMultilineWelcome) {
@@ skipping 231 matching lines @@
   FtpMockControlSocketFileDownloadRetrFail ctrl_socket;
   TransactionFailHelper(&ctrl_socket,
                         "ftp://host/file",
                         FtpMockControlSocket::PRE_RETR,
                         FtpMockControlSocket::PRE_PASV2,
                         "500 failed retr\r\n",
                         ERR_FAILED);
 }
 
 }  // namespace net