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/websockets/websocket_job.h" | 5 #include "net/websockets/websocket_job.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
297 connection->Init(host_port_pair_.ToString(), transport_params_, | 297 connection->Init(host_port_pair_.ToString(), transport_params_, |
298 net::MEDIUM, net::CompletionCallback(), | 298 net::MEDIUM, net::CompletionCallback(), |
299 http_session_->GetTransportSocketPool( | 299 http_session_->GetTransportSocketPool( |
300 net::HttpNetworkSession::NORMAL_SOCKET_POOL), | 300 net::HttpNetworkSession::NORMAL_SOCKET_POOL), |
301 net::BoundNetLog())); | 301 net::BoundNetLog())); |
302 EXPECT_EQ(net::OK, | 302 EXPECT_EQ(net::OK, |
303 session_->InitializeWithSocket(connection, false, net::OK)); | 303 session_->InitializeWithSocket(connection, false, net::OK)); |
304 } | 304 } |
305 | 305 |
306 virtual int CreateTransaction( | 306 virtual int CreateTransaction( |
307 scoped_ptr<net::HttpTransaction>* trans) OVERRIDE { | 307 scoped_ptr<net::HttpTransaction>* trans, |
| 308 net::HttpTransactionDelegate* delegate) OVERRIDE { |
308 NOTREACHED(); | 309 NOTREACHED(); |
309 return net::ERR_UNEXPECTED; | 310 return net::ERR_UNEXPECTED; |
310 } | 311 } |
311 | 312 |
312 virtual net::HttpCache* GetCache() OVERRIDE { | 313 virtual net::HttpCache* GetCache() OVERRIDE { |
313 NOTREACHED(); | 314 NOTREACHED(); |
314 return NULL; | 315 return NULL; |
315 } | 316 } |
316 | 317 |
317 virtual net::HttpNetworkSession* GetSession() OVERRIDE { | 318 virtual net::HttpNetworkSession* GetSession() OVERRIDE { |
(...skipping 773 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1091 | 1092 |
1092 TEST_F(WebSocketJobSpdy2Test, ThrottlingSpdySpdyEnabled) { | 1093 TEST_F(WebSocketJobSpdy2Test, ThrottlingSpdySpdyEnabled) { |
1093 WebSocketJob::set_websocket_over_spdy_enabled(true); | 1094 WebSocketJob::set_websocket_over_spdy_enabled(true); |
1094 TestConnectBySpdy(SPDY_ON, THROTTLING_ON); | 1095 TestConnectBySpdy(SPDY_ON, THROTTLING_ON); |
1095 } | 1096 } |
1096 | 1097 |
1097 // TODO(toyoshim): Add tests to verify throttling, SPDY stream limitation. | 1098 // TODO(toyoshim): Add tests to verify throttling, SPDY stream limitation. |
1098 // TODO(toyoshim,yutak): Add tests to verify closing handshake. | 1099 // TODO(toyoshim,yutak): Add tests to verify closing handshake. |
1099 | 1100 |
1100 } // namespace net | 1101 } // namespace net |
OLD | NEW |