| 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/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/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "base/time/time.h" | 10 #include "base/time/time.h" |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 } | 121 } |
| 122 | 122 |
| 123 void HttpProxyConnectJob::GetAdditionalErrorState(ClientSocketHandle * handle) { | 123 void HttpProxyConnectJob::GetAdditionalErrorState(ClientSocketHandle * handle) { |
| 124 if (error_response_info_.cert_request_info.get()) { | 124 if (error_response_info_.cert_request_info.get()) { |
| 125 handle->set_ssl_error_response_info(error_response_info_); | 125 handle->set_ssl_error_response_info(error_response_info_); |
| 126 handle->set_is_ssl_error(true); | 126 handle->set_is_ssl_error(true); |
| 127 } | 127 } |
| 128 } | 128 } |
| 129 | 129 |
| 130 void HttpProxyConnectJob::OnIOComplete(int result) { | 130 void HttpProxyConnectJob::OnIOComplete(int result) { |
| 131 // TODO(pkasting): Remove ScopedTracker below once crbug.com/455884 is fixed. |
| 132 tracked_objects::ScopedTracker tracking_profile( |
| 133 FROM_HERE_WITH_EXPLICIT_FUNCTION( |
| 134 "455884 HttpProxyConnectJob::OnIOComplete")); |
| 131 int rv = DoLoop(result); | 135 int rv = DoLoop(result); |
| 132 if (rv != ERR_IO_PENDING) { | 136 if (rv != ERR_IO_PENDING) { |
| 133 NotifyProxyDelegateOfCompletion(rv); | 137 NotifyProxyDelegateOfCompletion(rv); |
| 134 NotifyDelegateOfCompletion(rv); // Deletes |this| | 138 NotifyDelegateOfCompletion(rv); // Deletes |this| |
| 135 } | 139 } |
| 136 } | 140 } |
| 137 | 141 |
| 138 int HttpProxyConnectJob::DoLoop(int result) { | 142 int HttpProxyConnectJob::DoLoop(int result) { |
| 139 DCHECK_NE(next_state_, STATE_NONE); | 143 DCHECK_NE(next_state_, STATE_NONE); |
| 140 | 144 |
| (...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 562 base_.RemoveHigherLayeredPool(higher_pool); | 566 base_.RemoveHigherLayeredPool(higher_pool); |
| 563 } | 567 } |
| 564 | 568 |
| 565 bool HttpProxyClientSocketPool::CloseOneIdleConnection() { | 569 bool HttpProxyClientSocketPool::CloseOneIdleConnection() { |
| 566 if (base_.CloseOneIdleSocket()) | 570 if (base_.CloseOneIdleSocket()) |
| 567 return true; | 571 return true; |
| 568 return base_.CloseOneIdleConnectionInHigherLayeredPool(); | 572 return base_.CloseOneIdleConnectionInHigherLayeredPool(); |
| 569 } | 573 } |
| 570 | 574 |
| 571 } // namespace net | 575 } // namespace net |
| OLD | NEW |