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

net/ftp/ftp_network_transaction.cc

 // Copyright (c) 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/ftp/ftp_network_transaction.h"
 
 #include "base/compiler_specific.h"
 #include "base/string_util.h"
 #include "net/base/client_socket.h"
 #include "net/base/client_socket_factory.h"
@@ skipping 321 matching lines @@
 
 int FtpNetworkTransaction::DoCtrlResolveHost() {
   next_state_ = STATE_CTRL_RESOLVE_HOST_COMPLETE;
 
   std::string host;
   int port;
 
   host = request_->url.host();
   port = request_->url.EffectiveIntPort();
 
-  DidStartDnsResolution(host, this);
-  return resolver_.Resolve(host, port, &addresses_, &io_callback_);
+  HostResolver::RequestInfo info(host, port);
+  // No known referrer.
+  return resolver_.Resolve(info, &addresses_, &io_callback_);
 }
 
 int FtpNetworkTransaction::DoCtrlResolveHostComplete(int result) {
   bool ok = (result == OK);
-  DidFinishDnsResolutionWithStatus(ok, GURL(), this);
   if (ok) {
     next_state_ = STATE_CTRL_CONNECT;
     return result;
   }
   return ERR_FAILED;
 }
 
 int FtpNetworkTransaction::DoCtrlConnect() {
   next_state_ = STATE_CTRL_CONNECT_COMPLETE;
   ctrl_socket_.reset(socket_factory_->CreateTCPClientSocket(addresses_));
@@ skipping 466 matching lines @@
 }
 
 // Data Connection
 
 int FtpNetworkTransaction::DoDataResolveHost() {
   if (data_socket_ != NULL && data_socket_->IsConnected())
     data_socket_->Disconnect();
 
   next_state_ = STATE_DATA_RESOLVE_HOST_COMPLETE;
 
-  DidStartDnsResolution(data_connection_ip_, this);
-  return resolver_.Resolve(data_connection_ip_, data_connection_port_,
-      &addresses_, &io_callback_);
+  HostResolver::RequestInfo info(data_connection_ip_,
+                                 data_connection_port_);
+  // No known referrer.
+  return resolver_.Resolve(info, &addresses_, &io_callback_);
 }
 
 int FtpNetworkTransaction::DoDataResolveHostComplete(int result) {
   bool ok = (result == OK);
-  DidFinishDnsResolutionWithStatus(ok, GURL(), this);
   if (ok) {
     next_state_ = STATE_DATA_CONNECT;
     return result;
   }
   return ERR_FAILED;
 }
 
 int FtpNetworkTransaction::DoDataConnect() {
   next_state_ = STATE_DATA_CONNECT_COMPLETE;
   data_socket_.reset(socket_factory_->CreateTCPClientSocket(addresses_));
@@ skipping 19 matching lines @@
                             &io_callback_);
 }
 
 int FtpNetworkTransaction::DoDataReadComplete(int result) {
   DLOG(INFO) << read_data_buf_->data();  // The read_data_buf_ is NULL
                                          // terminated string.
   return result;
 }
 
 }  // namespace net