Clean up FtpTransactionFacory ownership.

net/url_request/url_request_unittest.cc

Index: net/url_request/url_request_unittest.cc
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index 5b98e35153751db431f745e670ecf9a6665be286..3a1442133076776c45a50e443e381fecf57a7d28 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -9858,8 +9858,7 @@ TEST_F(HTTPSCRLSetTest, CRLSetRevoked) {
 class URLRequestTestFTP : public URLRequestTest {
  public:
   URLRequestTestFTP()
-      : ftp_transaction_factory_(&host_resolver_),
-        ftp_test_server_(SpawnedTestServer::TYPE_FTP,
+      : ftp_test_server_(SpawnedTestServer::TYPE_FTP,
                          SpawnedTestServer::kLocalhost,
                          base::FilePath(kTestFilePath)) {
     // Can't use |default_context_|'s HostResolver to set up the
@@ -9871,7 +9870,7 @@ class URLRequestTestFTP : public URLRequestTest {
   void SetUpFactory() override {
     // Add FTP support to the default URLRequestContext.
     job_factory_impl_->SetProtocolHandler(
-        "ftp", base::MakeUnique<FtpProtocolHandler>(&ftp_transaction_factory_));
+        "ftp", FtpProtocolHandler::Create(&host_resolver_));
   }
 
   std::string GetTestFileContents() {
@@ -9886,7 +9885,6 @@ class URLRequestTestFTP : public URLRequestTest {
 
  protected:
   MockHostResolver host_resolver_;

[eroman, 2016/10/19 16:29:51]

Note this does mean that now the ftp protocol handler briefly outlives the host
resolver dependency it holds.

[mmenke, 2016/10/19 17:09:35]

Added a comment (This was the case with the FtpProtocolHandler before, so still
basically the same weirdness).

-  FtpNetworkLayer ftp_transaction_factory_;
 
   SpawnedTestServer ftp_test_server_;
 };