| 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 945 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 956 waiter.WaitForStream(); | 956 waiter.WaitForStream(); |
| 957 EXPECT_TRUE(waiter.stream_done()); | 957 EXPECT_TRUE(waiter.stream_done()); |
| 958 EXPECT_TRUE(NULL == waiter.stream()); | 958 EXPECT_TRUE(NULL == waiter.stream()); |
| 959 ASSERT_TRUE(NULL != waiter.websocket_stream()); | 959 ASSERT_TRUE(NULL != waiter.websocket_stream()); |
| 960 EXPECT_EQ(MockWebSocketHandshakeStream::kStreamTypeBasic, | 960 EXPECT_EQ(MockWebSocketHandshakeStream::kStreamTypeBasic, |
| 961 waiter.websocket_stream()->type()); | 961 waiter.websocket_stream()->type()); |
| 962 EXPECT_EQ(0, GetSocketPoolGroupCount( | 962 EXPECT_EQ(0, GetSocketPoolGroupCount( |
| 963 session->GetTransportSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL))); | 963 session->GetTransportSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL))); |
| 964 EXPECT_EQ(0, GetSocketPoolGroupCount( | 964 EXPECT_EQ(0, GetSocketPoolGroupCount( |
| 965 session->GetSSLSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL))); | 965 session->GetSSLSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL))); |
| 966 EXPECT_EQ(1, GetSocketPoolGroupCount( | |
| 967 session->GetTransportSocketPool( | |
| 968 HttpNetworkSession::WEBSOCKET_SOCKET_POOL))); | |
| 969 EXPECT_EQ(0, GetSocketPoolGroupCount( | 966 EXPECT_EQ(0, GetSocketPoolGroupCount( |
| 970 session->GetSSLSocketPool(HttpNetworkSession::WEBSOCKET_SOCKET_POOL))); | 967 session->GetSSLSocketPool(HttpNetworkSession::WEBSOCKET_SOCKET_POOL))); |
| 971 EXPECT_TRUE(waiter.used_proxy_info().is_direct()); | 968 EXPECT_TRUE(waiter.used_proxy_info().is_direct()); |
| 972 } | 969 } |
| 973 | 970 |
| 974 TEST_P(HttpStreamFactoryTest, RequestWebSocketBasicHandshakeStreamOverSSL) { | 971 TEST_P(HttpStreamFactoryTest, RequestWebSocketBasicHandshakeStreamOverSSL) { |
| 975 SpdySessionDependencies session_deps( | 972 SpdySessionDependencies session_deps( |
| 976 GetParam(), ProxyService::CreateDirect()); | 973 GetParam(), ProxyService::CreateDirect()); |
| 977 | 974 |
| 978 MockRead mock_read(ASYNC, OK); | 975 MockRead mock_read(ASYNC, OK); |
| (...skipping 29 matching lines...) Expand all Loading... |
| 1008 EXPECT_TRUE(waiter.stream_done()); | 1005 EXPECT_TRUE(waiter.stream_done()); |
| 1009 EXPECT_TRUE(NULL == waiter.stream()); | 1006 EXPECT_TRUE(NULL == waiter.stream()); |
| 1010 ASSERT_TRUE(NULL != waiter.websocket_stream()); | 1007 ASSERT_TRUE(NULL != waiter.websocket_stream()); |
| 1011 EXPECT_EQ(MockWebSocketHandshakeStream::kStreamTypeBasic, | 1008 EXPECT_EQ(MockWebSocketHandshakeStream::kStreamTypeBasic, |
| 1012 waiter.websocket_stream()->type()); | 1009 waiter.websocket_stream()->type()); |
| 1013 EXPECT_EQ(0, GetSocketPoolGroupCount( | 1010 EXPECT_EQ(0, GetSocketPoolGroupCount( |
| 1014 session->GetTransportSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL))); | 1011 session->GetTransportSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL))); |
| 1015 EXPECT_EQ(0, GetSocketPoolGroupCount( | 1012 EXPECT_EQ(0, GetSocketPoolGroupCount( |
| 1016 session->GetSSLSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL))); | 1013 session->GetSSLSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL))); |
| 1017 EXPECT_EQ(1, GetSocketPoolGroupCount( | 1014 EXPECT_EQ(1, GetSocketPoolGroupCount( |
| 1018 session->GetTransportSocketPool( | |
| 1019 HttpNetworkSession::WEBSOCKET_SOCKET_POOL))); | |
| 1020 EXPECT_EQ(1, GetSocketPoolGroupCount( | |
| 1021 session->GetSSLSocketPool(HttpNetworkSession::WEBSOCKET_SOCKET_POOL))); | 1015 session->GetSSLSocketPool(HttpNetworkSession::WEBSOCKET_SOCKET_POOL))); |
| 1022 EXPECT_TRUE(waiter.used_proxy_info().is_direct()); | 1016 EXPECT_TRUE(waiter.used_proxy_info().is_direct()); |
| 1023 } | 1017 } |
| 1024 | 1018 |
| 1025 TEST_P(HttpStreamFactoryTest, RequestWebSocketBasicHandshakeStreamOverProxy) { | 1019 TEST_P(HttpStreamFactoryTest, RequestWebSocketBasicHandshakeStreamOverProxy) { |
| 1026 SpdySessionDependencies session_deps( | 1020 SpdySessionDependencies session_deps( |
| 1027 GetParam(), ProxyService::CreateFixed("myproxy:8888")); | 1021 GetParam(), ProxyService::CreateFixed("myproxy:8888")); |
| 1028 | 1022 |
| 1029 MockRead read(SYNCHRONOUS, "HTTP/1.0 200 Connection established\r\n\r\n"); | 1023 MockRead read(SYNCHRONOUS, "HTTP/1.0 200 Connection established\r\n\r\n"); |
| 1030 StaticSocketDataProvider socket_data(&read, 1, 0, 0); | 1024 StaticSocketDataProvider socket_data(&read, 1, 0, 0); |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1173 ASSERT_TRUE(NULL != waiter1.websocket_stream()); | 1167 ASSERT_TRUE(NULL != waiter1.websocket_stream()); |
| 1174 EXPECT_EQ(MockWebSocketHandshakeStream::kStreamTypeBasic, | 1168 EXPECT_EQ(MockWebSocketHandshakeStream::kStreamTypeBasic, |
| 1175 waiter1.websocket_stream()->type()); | 1169 waiter1.websocket_stream()->type()); |
| 1176 EXPECT_TRUE(NULL == waiter1.stream()); | 1170 EXPECT_TRUE(NULL == waiter1.stream()); |
| 1177 | 1171 |
| 1178 EXPECT_EQ(0, GetSocketPoolGroupCount( | 1172 EXPECT_EQ(0, GetSocketPoolGroupCount( |
| 1179 session->GetTransportSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL))); | 1173 session->GetTransportSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL))); |
| 1180 EXPECT_EQ(0, GetSocketPoolGroupCount( | 1174 EXPECT_EQ(0, GetSocketPoolGroupCount( |
| 1181 session->GetSSLSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL))); | 1175 session->GetSSLSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL))); |
| 1182 EXPECT_EQ(1, GetSocketPoolGroupCount( | 1176 EXPECT_EQ(1, GetSocketPoolGroupCount( |
| 1183 session->GetTransportSocketPool( | |
| 1184 HttpNetworkSession::WEBSOCKET_SOCKET_POOL))); | |
| 1185 EXPECT_EQ(1, GetSocketPoolGroupCount( | |
| 1186 session->GetSSLSocketPool(HttpNetworkSession::WEBSOCKET_SOCKET_POOL))); | 1177 session->GetSSLSocketPool(HttpNetworkSession::WEBSOCKET_SOCKET_POOL))); |
| 1187 EXPECT_TRUE(waiter1.used_proxy_info().is_direct()); | 1178 EXPECT_TRUE(waiter1.used_proxy_info().is_direct()); |
| 1188 } | 1179 } |
| 1189 | 1180 |
| 1190 // TODO(ricea): Re-enable once WebSocket-over-SPDY is implemented. | 1181 // TODO(ricea): Re-enable once WebSocket-over-SPDY is implemented. |
| 1191 TEST_P(HttpStreamFactoryTest, DISABLED_RequestWebSocketSpdyHandshakeStream) { | 1182 TEST_P(HttpStreamFactoryTest, DISABLED_RequestWebSocketSpdyHandshakeStream) { |
| 1192 SpdySessionDependencies session_deps(GetParam(), | 1183 SpdySessionDependencies session_deps(GetParam(), |
| 1193 ProxyService::CreateDirect()); | 1184 ProxyService::CreateDirect()); |
| 1194 | 1185 |
| 1195 MockRead mock_read(SYNCHRONOUS, ERR_IO_PENDING); | 1186 MockRead mock_read(SYNCHRONOUS, ERR_IO_PENDING); |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1335 EXPECT_TRUE(waiter.used_proxy_info().is_direct()); | 1326 EXPECT_TRUE(waiter.used_proxy_info().is_direct()); |
| 1336 | 1327 |
| 1337 // Make sure there is no orphaned job. it is already canceled. | 1328 // Make sure there is no orphaned job. it is already canceled. |
| 1338 ASSERT_EQ(0u, static_cast<HttpStreamFactoryImpl*>( | 1329 ASSERT_EQ(0u, static_cast<HttpStreamFactoryImpl*>( |
| 1339 session->http_stream_factory_for_websocket())->num_orphaned_jobs()); | 1330 session->http_stream_factory_for_websocket())->num_orphaned_jobs()); |
| 1340 } | 1331 } |
| 1341 | 1332 |
| 1342 } // namespace | 1333 } // namespace |
| 1343 | 1334 |
| 1344 } // namespace net | 1335 } // namespace net |
| OLD | NEW |