| Index: content/browser/renderer_host/pepper/pepper_tcp_socket.cc
|
| ===================================================================
|
| --- content/browser/renderer_host/pepper/pepper_tcp_socket.cc (revision 155271)
|
| +++ content/browser/renderer_host/pepper/pepper_tcp_socket.cc (working copy)
|
| @@ -69,7 +69,8 @@
|
| socket_->Disconnect();
|
| }
|
|
|
| -void PepperTCPSocket::Connect(const std::string& host, uint16_t port) {
|
| +void PepperTCPSocket::Connect(const std::string& host, uint16_t port,
|
| + net::HostResolver* host_resolver) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
|
|
| if (connection_state_ != BEFORE_CONNECT) {
|
| @@ -79,8 +80,7 @@
|
|
|
| connection_state_ = CONNECT_IN_PROGRESS;
|
| net::HostResolver::RequestInfo request_info(net::HostPortPair(host, port));
|
| - resolver_.reset(new net::SingleRequestHostResolver(
|
| - manager_->GetHostResolver()));
|
| + resolver_.reset(new net::SingleRequestHostResolver(host_resolver));
|
| int result = resolver_->Resolve(
|
| request_info, &address_list_,
|
| base::Bind(&PepperTCPSocket::OnResolveCompleted, base::Unretained(this)),
|
|
|