| Index: content/browser/renderer_host/pepper/pepper_network_proxy_host.cc
|
| diff --git a/content/browser/renderer_host/pepper/pepper_network_proxy_host.cc b/content/browser/renderer_host/pepper/pepper_network_proxy_host.cc
|
| index b80d1c6f9c3566c494a4e2cc9543c9092578fa89..5d7e48a394b2c18e111a1aeabef3631db0f00cea 100644
|
| --- a/content/browser/renderer_host/pepper/pepper_network_proxy_host.cc
|
| +++ b/content/browser/renderer_host/pepper/pepper_network_proxy_host.cc
|
| @@ -139,20 +139,21 @@ void PepperNetworkProxyHost::TryToSendUnsentRequests() {
|
| } else {
|
| // Everything looks valid, so try to resolve the proxy.
|
| net::ProxyInfo* proxy_info = new net::ProxyInfo;
|
| net::ProxyService::PacRequest* pending_request = NULL;
|
| base::Callback<void(int)> callback =
|
| base::Bind(&PepperNetworkProxyHost::OnResolveProxyCompleted,
|
| weak_factory_.GetWeakPtr(),
|
| request.reply_context,
|
| base::Owned(proxy_info));
|
| int result = proxy_service_->ResolveProxy(request.url,
|
| + std::string(),
|
| net::LOAD_NORMAL,
|
| proxy_info,
|
| callback,
|
| &pending_request,
|
| NULL,
|
| net::BoundNetLog());
|
| pending_requests_.push(pending_request);
|
| // If it was handled synchronously, we must run the callback now;
|
| // proxy_service_ won't run it for us in this case.
|
| if (result != net::ERR_IO_PENDING)
|
|
|