OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/http/http_proxy_client_socket_pool.h" | 5 #include "net/http/http_proxy_client_socket_pool.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/time.h" | 9 #include "base/time.h" |
10 #include "base/values.h" | 10 #include "base/values.h" |
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
99 case STATE_SPDY_PROXY_CREATE_STREAM: | 99 case STATE_SPDY_PROXY_CREATE_STREAM: |
100 case STATE_SPDY_PROXY_CREATE_STREAM_COMPLETE: | 100 case STATE_SPDY_PROXY_CREATE_STREAM_COMPLETE: |
101 return LOAD_STATE_ESTABLISHING_PROXY_TUNNEL; | 101 return LOAD_STATE_ESTABLISHING_PROXY_TUNNEL; |
102 default: | 102 default: |
103 NOTREACHED(); | 103 NOTREACHED(); |
104 return LOAD_STATE_IDLE; | 104 return LOAD_STATE_IDLE; |
105 } | 105 } |
106 } | 106 } |
107 | 107 |
108 void HttpProxyConnectJob::GetAdditionalErrorState(ClientSocketHandle * handle) { | 108 void HttpProxyConnectJob::GetAdditionalErrorState(ClientSocketHandle * handle) { |
109 if (error_response_info_.cert_request_info) { | 109 if (error_response_info_.cert_request_info || |
| 110 error_response_info_.login_request_info) { |
110 handle->set_ssl_error_response_info(error_response_info_); | 111 handle->set_ssl_error_response_info(error_response_info_); |
111 handle->set_is_ssl_error(true); | 112 handle->set_is_ssl_error(true); |
112 } | 113 } |
113 } | 114 } |
114 | 115 |
115 void HttpProxyConnectJob::OnIOComplete(int result) { | 116 void HttpProxyConnectJob::OnIOComplete(int result) { |
116 int rv = DoLoop(result); | 117 int rv = DoLoop(result); |
117 if (rv != ERR_IO_PENDING) | 118 if (rv != ERR_IO_PENDING) |
118 NotifyDelegateOfCompletion(rv); // Deletes |this| | 119 NotifyDelegateOfCompletion(rv); // Deletes |this| |
119 } | 120 } |
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
463 | 464 |
464 base::TimeDelta HttpProxyClientSocketPool::ConnectionTimeout() const { | 465 base::TimeDelta HttpProxyClientSocketPool::ConnectionTimeout() const { |
465 return base_.ConnectionTimeout(); | 466 return base_.ConnectionTimeout(); |
466 } | 467 } |
467 | 468 |
468 ClientSocketPoolHistograms* HttpProxyClientSocketPool::histograms() const { | 469 ClientSocketPoolHistograms* HttpProxyClientSocketPool::histograms() const { |
469 return base_.histograms(); | 470 return base_.histograms(); |
470 } | 471 } |
471 | 472 |
472 } // namespace net | 473 } // namespace net |
OLD | NEW |