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..cc36f9a11b6bfd1750c6162d72afbd08518df057 100644 |
--- a/content/browser/renderer_host/pepper/pepper_network_proxy_host.cc |
+++ b/content/browser/renderer_host/pepper/pepper_network_proxy_host.cc |
@@ -143,21 +143,22 @@ void PepperNetworkProxyHost::TryToSendUnsentRequests() { |
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, |
net::LOAD_NORMAL, |
proxy_info, |
callback, |
&pending_request, |
- NULL, |
+ nullptr, |
bengr
2016/02/16 20:00:13
Use NULL and std::string().
RyanSturm
2016/02/17 21:46:11
Done.
|
+ "", |
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); |
} |
unsent_requests_.pop(); |
} |
} |