Index: content/browser/resolve_proxy_msg_helper.cc |
diff --git a/content/browser/resolve_proxy_msg_helper.cc b/content/browser/resolve_proxy_msg_helper.cc |
index e189f1c83d3bd323dad707c38bad19d42c538f1c..53cc44df71b056a60d3c3b4d4a51b8ba605cbc75 100644 |
--- a/content/browser/resolve_proxy_msg_helper.cc |
+++ b/content/browser/resolve_proxy_msg_helper.cc |
@@ -88,18 +88,18 @@ void ResolveProxyMsgHelper::StartPendingRequest() { |
if (context_getter_.get()) { |
proxy_service_ = context_getter_->GetURLRequestContext()->proxy_service(); |
context_getter_ = NULL; |
} |
// Start the request. |
int result = proxy_service_->ResolveProxy( |
req.url, net::LOAD_NORMAL, &proxy_info_, |
base::Bind(&ResolveProxyMsgHelper::OnResolveProxyCompleted, |
base::Unretained(this)), |
- &req.pac_req, NULL, net::BoundNetLog()); |
+ &req.pac_req, nullptr, "", net::BoundNetLog()); |
bengr
2016/02/16 20:00:13
NULL and std::string()
RyanSturm
2016/02/17 21:46:11
Done.
|
// Completed synchronously. |
if (result != net::ERR_IO_PENDING) |
OnResolveProxyCompleted(result); |
} |
} // namespace content |