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 288 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
299 net::ClientSocketHandle* connection = new net::ClientSocketHandle; | 299 net::ClientSocketHandle* connection = new net::ClientSocketHandle; |
300 EXPECT_EQ(net::OK, | 300 EXPECT_EQ(net::OK, |
301 connection->Init(host_port_pair_.ToString(), transport_params_, | 301 connection->Init(host_port_pair_.ToString(), transport_params_, |
302 net::MEDIUM, net::CompletionCallback(), | 302 net::MEDIUM, net::CompletionCallback(), |
303 http_session_->GetTransportSocketPool( | 303 http_session_->GetTransportSocketPool( |
304 net::HttpNetworkSession::NORMAL_SOCKET_POOL), | 304 net::HttpNetworkSession::NORMAL_SOCKET_POOL), |
305 net::BoundNetLog())); | 305 net::BoundNetLog())); |
306 EXPECT_EQ(net::OK, | 306 EXPECT_EQ(net::OK, |
307 session_->InitializeWithSocket(connection, false, net::OK)); | 307 session_->InitializeWithSocket(connection, false, net::OK)); |
308 } | 308 } |
309 virtual int CreateTransaction(scoped_ptr<net::HttpTransaction>* trans) { | 309 virtual int CreateTransaction(scoped_ptr<net::HttpTransaction>* trans, |
| 310 net::HttpTransactionDelegate* delegate) { |
310 NOTREACHED(); | 311 NOTREACHED(); |
311 return net::ERR_UNEXPECTED; | 312 return net::ERR_UNEXPECTED; |
312 } | 313 } |
313 virtual net::HttpCache* GetCache() { | 314 virtual net::HttpCache* GetCache() { |
314 NOTREACHED(); | 315 NOTREACHED(); |
315 return NULL; | 316 return NULL; |
316 } | 317 } |
317 virtual net::HttpNetworkSession* GetSession() { | 318 virtual net::HttpNetworkSession* GetSession() { |
318 return http_session_.get(); | 319 return http_session_.get(); |
319 } | 320 } |
(...skipping 770 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1090 | 1091 |
1091 TEST_F(WebSocketJobSpdy3Test, ThrottlingSpdySpdyEnabled) { | 1092 TEST_F(WebSocketJobSpdy3Test, ThrottlingSpdySpdyEnabled) { |
1092 WebSocketJob::set_websocket_over_spdy_enabled(true); | 1093 WebSocketJob::set_websocket_over_spdy_enabled(true); |
1093 TestConnectBySpdy(SPDY_ON, THROTTLING_ON); | 1094 TestConnectBySpdy(SPDY_ON, THROTTLING_ON); |
1094 } | 1095 } |
1095 | 1096 |
1096 // TODO(toyoshim): Add tests to verify throttling, SPDY stream limitation. | 1097 // TODO(toyoshim): Add tests to verify throttling, SPDY stream limitation. |
1097 // TODO(toyoshim,yutak): Add tests to verify closing handshake. | 1098 // TODO(toyoshim,yutak): Add tests to verify closing handshake. |
1098 | 1099 |
1099 } // namespace net | 1100 } // namespace net |
OLD | NEW |