| 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 1f9ac0effa68cec578b0ecd5e1edb783d33cb199..7939a82846964d9e8749189eaccfaa235493d543 100644
|
| --- a/content/browser/renderer_host/pepper/pepper_network_proxy_host.cc
|
| +++ b/content/browser/renderer_host/pepper/pepper_network_proxy_host.cc
|
| @@ -5,21 +5,20 @@
|
| #include "content/browser/renderer_host/pepper/pepper_network_proxy_host.h"
|
|
|
| #include "base/bind.h"
|
| #include "content/browser/renderer_host/pepper/browser_ppapi_host_impl.h"
|
| #include "content/browser/renderer_host/pepper/pepper_socket_utils.h"
|
| #include "content/public/browser/browser_context.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/render_process_host.h"
|
| #include "content/public/browser/storage_partition.h"
|
| #include "content/public/common/socket_permission_request.h"
|
| -#include "net/base/load_flags.h"
|
| #include "net/base/net_errors.h"
|
| #include "net/proxy/proxy_info.h"
|
| #include "net/url_request/url_request_context.h"
|
| #include "net/url_request/url_request_context_getter.h"
|
| #include "ppapi/c/pp_errors.h"
|
| #include "ppapi/host/dispatch_host_message.h"
|
| #include "ppapi/host/ppapi_host.h"
|
| #include "ppapi/proxy/ppapi_messages.h"
|
|
|
| namespace content {
|
| @@ -140,21 +139,20 @@ void PepperNetworkProxyHost::TryToSendUnsentRequests() {
|
| // 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)
|
| callback.Run(result);
|
|
|