summaryrefslogtreecommitdiffstats
path: root/net/http/http_proxy_client_socket_pool.cc
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-05 15:29:50 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-05 15:29:50 +0000
commit36478248362c460c5ce639ec84fb6568b71f18f0 (patch)
treeb8e3a1b2f9a827ab234de3e0f69077656a5b068f /net/http/http_proxy_client_socket_pool.cc
parent384e6a01e05070444b297cb9a7415b66224f3d9d (diff)
downloadchromium_src-36478248362c460c5ce639ec84fb6568b71f18f0.zip
chromium_src-36478248362c460c5ce639ec84fb6568b71f18f0.tar.gz
chromium_src-36478248362c460c5ce639ec84fb6568b71f18f0.tar.bz2
net: code style fixups - no semantic change.
(Needed to do this because it was distracting me too much.) git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124943 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_proxy_client_socket_pool.cc')
-rw-r--r--net/http/http_proxy_client_socket_pool.cc25
1 files changed, 15 insertions, 10 deletions
diff --git a/net/http/http_proxy_client_socket_pool.cc b/net/http/http_proxy_client_socket_pool.cc
index 7a51717..fc7cf63 100644
--- a/net/http/http_proxy_client_socket_pool.cc
+++ b/net/http/http_proxy_client_socket_pool.cc
@@ -49,17 +49,19 @@ HttpProxySocketParams::HttpProxySocketParams(
tunnel_(tunnel) {
DCHECK((transport_params == NULL && ssl_params != NULL) ||
(transport_params != NULL && ssl_params == NULL));
- if (transport_params_)
+ if (transport_params_) {
ignore_limits_ = transport_params->ignore_limits();
- else
+ } else {
ignore_limits_ = ssl_params->ignore_limits();
+ }
}
const HostResolver::RequestInfo& HttpProxySocketParams::destination() const {
- if (transport_params_ == NULL)
+ if (transport_params_ == NULL) {
return ssl_params_->transport_params()->destination();
- else
+ } else {
return transport_params_->destination();
+ }
}
HttpProxySocketParams::~HttpProxySocketParams() {}
@@ -218,12 +220,13 @@ int HttpProxyConnectJob::DoSSLConnectComplete(int result) {
return result;
}
if (IsCertificateError(result)) {
- if (params_->ssl_params()->load_flags() & LOAD_IGNORE_ALL_CERT_ERRORS)
+ if (params_->ssl_params()->load_flags() & LOAD_IGNORE_ALL_CERT_ERRORS) {
result = OK;
- else
+ } else {
// TODO(rch): allow the user to deal with proxy cert errors in the
// same way as server cert errors.
return ERR_PROXY_CERTIFICATE_INVALID;
+ }
}
if (result < 0) {
if (transport_socket_handle_->socket())
@@ -247,10 +250,11 @@ int HttpProxyConnectJob::DoSSLConnectComplete(int result) {
// need to add a predicate to this if statement so we fall through
// to the else case. (HttpProxyClientSocket currently acts as
// a "trusted" SPDY proxy).
- if (using_spdy_ && params_->tunnel())
+ if (using_spdy_ && params_->tunnel()) {
next_state_ = STATE_SPDY_PROXY_CREATE_STREAM;
- else
+ } else {
next_state_ = STATE_HTTP_PROXY_CONNECT;
+ }
return result;
}
@@ -332,10 +336,11 @@ int HttpProxyConnectJob::DoSpdyProxyCreateStreamComplete(int result) {
}
int HttpProxyConnectJob::ConnectInternal() {
- if (params_->transport_params())
+ if (params_->transport_params()) {
next_state_ = STATE_TCP_CONNECT;
- else
+ } else {
next_state_ = STATE_SSL_CONNECT;
+ }
return DoLoop(OK);
}