Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(254)

Unified Diff: jingle/glue/proxy_resolving_client_socket.cc

Issue 1684123004: Bypass the DataReductionProxy for all POST requests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resubmitting with upstream branch set to branch from issue 1680893002 Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: jingle/glue/proxy_resolving_client_socket.cc
diff --git a/jingle/glue/proxy_resolving_client_socket.cc b/jingle/glue/proxy_resolving_client_socket.cc
index a932399efd24598df6759c9b627018a017c77752..10bfd4e80760498a98323498794f094ff65f67b0 100644
--- a/jingle/glue/proxy_resolving_client_socket.cc
+++ b/jingle/glue/proxy_resolving_client_socket.cc
@@ -138,21 +138,22 @@ int ProxyResolvingClientSocket::Connect(
tried_direct_connect_fallback_ = false;
// First we try and resolve the proxy.
int status = network_session_->proxy_service()->ResolveProxy(
proxy_url_,
net::LOAD_NORMAL,
&proxy_info_,
proxy_resolve_callback_,
&pac_request_,
- NULL,
+ nullptr,
bengr 2016/02/16 20:00:13 NULL, std::string()
RyanSturm 2016/02/17 21:46:11 Done.
+ "",
bound_net_log_);
if (status != net::ERR_IO_PENDING) {
// We defer execution of ProcessProxyResolveDone instead of calling it
// directly here for simplicity. From the caller's point of view,
// the connect always happens asynchronously.
base::MessageLoop* message_loop = base::MessageLoop::current();
CHECK(message_loop);
message_loop->PostTask(
FROM_HERE,
base::Bind(&ProxyResolvingClientSocket::ProcessProxyResolveDone,
@@ -286,21 +287,21 @@ int ProxyResolvingClientSocket::ReconsiderProxyAfterError(int error) {
return error;
}
if (proxy_info_.is_https() && ssl_config_.send_client_cert) {
network_session_->ssl_client_auth_cache()->Remove(
proxy_info_.proxy_server().host_port_pair());
}
int rv = network_session_->proxy_service()->ReconsiderProxyAfterError(
proxy_url_, net::LOAD_NORMAL, error, &proxy_info_,
- proxy_resolve_callback_, &pac_request_, NULL, bound_net_log_);
+ proxy_resolve_callback_, &pac_request_, nullptr, "", bound_net_log_);
bengr 2016/02/16 20:00:13 NULL, std::string()
RyanSturm 2016/02/17 21:46:11 Done.
if (rv == net::OK || rv == net::ERR_IO_PENDING) {
CloseTransportSocket();
} else {
// If ReconsiderProxyAfterError() failed synchronously, it means
// there was nothing left to fall-back to, so fail the transaction
// with the last connection error we got.
rv = error;
}
// We either have new proxy info or there was an error in falling back.

Powered by Google App Engine
This is Rietveld 408576698