Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1601)

Unified Diff: content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc

Issue 2214693002: First step to remove SingleRequestHostResolver. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: single Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc
diff --git a/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc b/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc
index e876ee9f5f2bacf30d08908e6b93d5f8f1857c8a..c9f705396c93e468ea2af4bf6bd5387a7e875a19 100644
--- a/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc
+++ b/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc
@@ -27,7 +27,6 @@
#include "net/base/io_buffer.h"
#include "net/base/ip_address.h"
#include "net/base/net_errors.h"
-#include "net/dns/single_request_host_resolver.h"
#include "net/socket/client_socket_factory.h"
#include "net/socket/client_socket_handle.h"
#include "net/socket/ssl_client_socket.h"
@@ -643,16 +642,12 @@ void PepperTCPSocketMessageFilter::DoConnect(
address_index_ = 0;
address_list_.clear();
net::HostResolver::RequestInfo request_info(net::HostPortPair(host, port));
- resolver_.reset(
- new net::SingleRequestHostResolver(resource_context->GetHostResolver()));
- int net_result = resolver_->Resolve(
- request_info,
- net::DEFAULT_PRIORITY,
- &address_list_,
+ net::HostResolver* resolver = resource_context->GetHostResolver();
+ int net_result = resolver->Resolve(
+ request_info, net::DEFAULT_PRIORITY, &address_list_,
base::Bind(&PepperTCPSocketMessageFilter::OnResolveCompleted,
- base::Unretained(this),
- context),
- net::BoundNetLog());
+ base::Unretained(this), context),
+ &request_, net::BoundNetLog());
if (net_result != net::ERR_IO_PENDING)
OnResolveCompleted(context, net_result);
}
« no previous file with comments | « content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.h ('k') | net/dns/host_resolver_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698