| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "net/socket/ssl_client_socket_pool.h" | 5 #include "net/socket/ssl_client_socket_pool.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
| 9 #include "base/metrics/field_trial.h" | 9 #include "base/metrics/field_trial.h" |
| 10 #include "base/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 131 base::Unretained(this))) {} | 131 base::Unretained(this))) {} |
| 132 | 132 |
| 133 SSLConnectJob::~SSLConnectJob() {} | 133 SSLConnectJob::~SSLConnectJob() {} |
| 134 | 134 |
| 135 LoadState SSLConnectJob::GetLoadState() const { | 135 LoadState SSLConnectJob::GetLoadState() const { |
| 136 switch (next_state_) { | 136 switch (next_state_) { |
| 137 case STATE_TUNNEL_CONNECT_COMPLETE: | 137 case STATE_TUNNEL_CONNECT_COMPLETE: |
| 138 if (transport_socket_handle_->socket()) | 138 if (transport_socket_handle_->socket()) |
| 139 return LOAD_STATE_ESTABLISHING_PROXY_TUNNEL; | 139 return LOAD_STATE_ESTABLISHING_PROXY_TUNNEL; |
| 140 // else, fall through. | 140 // else, fall through. |
| 141 FALLTHROUGH_INTENDED; |
| 141 case STATE_TRANSPORT_CONNECT: | 142 case STATE_TRANSPORT_CONNECT: |
| 142 case STATE_TRANSPORT_CONNECT_COMPLETE: | 143 case STATE_TRANSPORT_CONNECT_COMPLETE: |
| 143 case STATE_SOCKS_CONNECT: | 144 case STATE_SOCKS_CONNECT: |
| 144 case STATE_SOCKS_CONNECT_COMPLETE: | 145 case STATE_SOCKS_CONNECT_COMPLETE: |
| 145 case STATE_TUNNEL_CONNECT: | 146 case STATE_TUNNEL_CONNECT: |
| 146 return transport_socket_handle_->GetLoadState(); | 147 return transport_socket_handle_->GetLoadState(); |
| 147 case STATE_SSL_CONNECT: | 148 case STATE_SSL_CONNECT: |
| 148 case STATE_SSL_CONNECT_COMPLETE: | 149 case STATE_SSL_CONNECT_COMPLETE: |
| 149 return LOAD_STATE_SSL_HANDSHAKE; | 150 return LOAD_STATE_SSL_HANDSHAKE; |
| 150 default: | 151 default: |
| (...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 677 if (base_.CloseOneIdleSocket()) | 678 if (base_.CloseOneIdleSocket()) |
| 678 return true; | 679 return true; |
| 679 return base_.CloseOneIdleConnectionInHigherLayeredPool(); | 680 return base_.CloseOneIdleConnectionInHigherLayeredPool(); |
| 680 } | 681 } |
| 681 | 682 |
| 682 void SSLClientSocketPool::OnSSLConfigChanged() { | 683 void SSLClientSocketPool::OnSSLConfigChanged() { |
| 683 FlushWithError(ERR_NETWORK_CHANGED); | 684 FlushWithError(ERR_NETWORK_CHANGED); |
| 684 } | 685 } |
| 685 | 686 |
| 686 } // namespace net | 687 } // namespace net |
| OLD | NEW |