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 <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
158 const ProxyInfo& used_proxy_info, | 158 const ProxyInfo& used_proxy_info, |
159 WebSocketHandshakeStreamBase* stream) override { | 159 WebSocketHandshakeStreamBase* stream) override { |
160 stream_done_ = true; | 160 stream_done_ = true; |
161 if (waiting_for_stream_) | 161 if (waiting_for_stream_) |
162 base::MessageLoop::current()->Quit(); | 162 base::MessageLoop::current()->Quit(); |
163 websocket_stream_.reset(stream); | 163 websocket_stream_.reset(stream); |
164 used_ssl_config_ = used_ssl_config; | 164 used_ssl_config_ = used_ssl_config; |
165 used_proxy_info_ = used_proxy_info; | 165 used_proxy_info_ = used_proxy_info; |
166 } | 166 } |
167 | 167 |
168 void OnStreamFailed(int status, const SSLConfig& used_ssl_config) override {} | 168 void OnStreamFailed(int status, |
| 169 const SSLConfig& used_ssl_config, |
| 170 SSLFailureState ssl_failure_state) override {} |
169 | 171 |
170 void OnCertificateError(int status, | 172 void OnCertificateError(int status, |
171 const SSLConfig& used_ssl_config, | 173 const SSLConfig& used_ssl_config, |
172 const SSLInfo& ssl_info) override {} | 174 const SSLInfo& ssl_info) override {} |
173 | 175 |
174 void OnNeedsProxyAuth(const HttpResponseInfo& proxy_response, | 176 void OnNeedsProxyAuth(const HttpResponseInfo& proxy_response, |
175 const SSLConfig& used_ssl_config, | 177 const SSLConfig& used_ssl_config, |
176 const ProxyInfo& used_proxy_info, | 178 const ProxyInfo& used_proxy_info, |
177 HttpAuthController* auth_controller) override {} | 179 HttpAuthController* auth_controller) override {} |
178 | 180 |
(...skipping 1178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1357 EXPECT_TRUE(waiter.used_proxy_info().is_direct()); | 1359 EXPECT_TRUE(waiter.used_proxy_info().is_direct()); |
1358 | 1360 |
1359 // Make sure there is no orphaned job. it is already canceled. | 1361 // Make sure there is no orphaned job. it is already canceled. |
1360 ASSERT_EQ(0u, static_cast<HttpStreamFactoryImpl*>( | 1362 ASSERT_EQ(0u, static_cast<HttpStreamFactoryImpl*>( |
1361 session->http_stream_factory_for_websocket())->num_orphaned_jobs()); | 1363 session->http_stream_factory_for_websocket())->num_orphaned_jobs()); |
1362 } | 1364 } |
1363 | 1365 |
1364 } // namespace | 1366 } // namespace |
1365 | 1367 |
1366 } // namespace net | 1368 } // namespace net |
OLD | NEW |