| 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_stream_factory_impl.h" | 5 #include "net/http/http_stream_factory_impl.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 194 const ProxyInfo& used_proxy_info, | 194 const ProxyInfo& used_proxy_info, |
| 195 BidirectionalStreamImpl* stream) override { | 195 BidirectionalStreamImpl* stream) override { |
| 196 stream_done_ = true; | 196 stream_done_ = true; |
| 197 if (waiting_for_stream_) | 197 if (waiting_for_stream_) |
| 198 base::MessageLoop::current()->QuitWhenIdle(); | 198 base::MessageLoop::current()->QuitWhenIdle(); |
| 199 bidirectional_stream_impl_.reset(stream); | 199 bidirectional_stream_impl_.reset(stream); |
| 200 used_ssl_config_ = used_ssl_config; | 200 used_ssl_config_ = used_ssl_config; |
| 201 used_proxy_info_ = used_proxy_info; | 201 used_proxy_info_ = used_proxy_info; |
| 202 } | 202 } |
| 203 | 203 |
| 204 void OnStreamFailed(int status, | 204 void OnStreamFailed(int status, const SSLConfig& used_ssl_config) override { |
| 205 const SSLConfig& used_ssl_config, | |
| 206 SSLFailureState ssl_failure_state) override { | |
| 207 stream_done_ = true; | 205 stream_done_ = true; |
| 208 if (waiting_for_stream_) | 206 if (waiting_for_stream_) |
| 209 base::MessageLoop::current()->QuitWhenIdle(); | 207 base::MessageLoop::current()->QuitWhenIdle(); |
| 210 used_ssl_config_ = used_ssl_config; | 208 used_ssl_config_ = used_ssl_config; |
| 211 error_status_ = status; | 209 error_status_ = status; |
| 212 } | 210 } |
| 213 | 211 |
| 214 void OnCertificateError(int status, | 212 void OnCertificateError(int status, |
| 215 const SSLConfig& used_ssl_config, | 213 const SSLConfig& used_ssl_config, |
| 216 const SSLInfo& ssl_info) override {} | 214 const SSLInfo& ssl_info) override {} |
| (...skipping 1862 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2079 session->GetTransportSocketPool( | 2077 session->GetTransportSocketPool( |
| 2080 HttpNetworkSession::WEBSOCKET_SOCKET_POOL))); | 2078 HttpNetworkSession::WEBSOCKET_SOCKET_POOL))); |
| 2081 EXPECT_EQ(1, GetSocketPoolGroupCount( | 2079 EXPECT_EQ(1, GetSocketPoolGroupCount( |
| 2082 session->GetSSLSocketPool(HttpNetworkSession::WEBSOCKET_SOCKET_POOL))); | 2080 session->GetSSLSocketPool(HttpNetworkSession::WEBSOCKET_SOCKET_POOL))); |
| 2083 EXPECT_TRUE(waiter.used_proxy_info().is_direct()); | 2081 EXPECT_TRUE(waiter.used_proxy_info().is_direct()); |
| 2084 } | 2082 } |
| 2085 | 2083 |
| 2086 } // namespace | 2084 } // namespace |
| 2087 | 2085 |
| 2088 } // namespace net | 2086 } // namespace net |
| OLD | NEW |