| 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 869 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 880 for (int num_streams = 1; num_streams < 3; ++num_streams) { | 880 for (int num_streams = 1; num_streams < 3; ++num_streams) { |
| 881 GURL url = GURL("https://www.google.com"); | 881 GURL url = GURL("https://www.google.com"); |
| 882 | 882 |
| 883 // Set up QUIC as alternative_service. | 883 // Set up QUIC as alternative_service. |
| 884 HttpServerPropertiesImpl http_server_properties; | 884 HttpServerPropertiesImpl http_server_properties; |
| 885 const AlternativeService alternative_service(QUIC, url.host().c_str(), | 885 const AlternativeService alternative_service(QUIC, url.host().c_str(), |
| 886 url.IntPort()); | 886 url.IntPort()); |
| 887 AlternativeServiceInfoVector alternative_service_info_vector; | 887 AlternativeServiceInfoVector alternative_service_info_vector; |
| 888 base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); | 888 base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); |
| 889 alternative_service_info_vector.push_back( | 889 alternative_service_info_vector.push_back( |
| 890 AlternativeServiceInfo(alternative_service, 1.0, expiration)); | 890 AlternativeServiceInfo(alternative_service, expiration)); |
| 891 HostPortPair host_port_pair(alternative_service.host_port_pair()); | 891 HostPortPair host_port_pair(alternative_service.host_port_pair()); |
| 892 http_server_properties.SetAlternativeServices( | 892 http_server_properties.SetAlternativeServices( |
| 893 host_port_pair, alternative_service_info_vector); | 893 host_port_pair, alternative_service_info_vector); |
| 894 | 894 |
| 895 SpdySessionDependencies session_deps( | 895 SpdySessionDependencies session_deps( |
| 896 GetParam(), ProxyService::CreateFixed("http_proxy")); | 896 GetParam(), ProxyService::CreateFixed("http_proxy")); |
| 897 | 897 |
| 898 // Setup params to disable preconnect, but QUIC doesn't 0RTT. | 898 // Setup params to disable preconnect, but QUIC doesn't 0RTT. |
| 899 HttpNetworkSession::Params params = | 899 HttpNetworkSession::Params params = |
| 900 SpdySessionDependencies::CreateSessionParams(&session_deps); | 900 SpdySessionDependencies::CreateSessionParams(&session_deps); |
| (...skipping 23 matching lines...) Expand all Loading... |
| 924 TEST_P(HttpStreamFactoryTest, QuicDisablePreConnectIfZeroRtt) { | 924 TEST_P(HttpStreamFactoryTest, QuicDisablePreConnectIfZeroRtt) { |
| 925 for (int num_streams = 1; num_streams < 3; ++num_streams) { | 925 for (int num_streams = 1; num_streams < 3; ++num_streams) { |
| 926 GURL url = GURL("https://www.google.com"); | 926 GURL url = GURL("https://www.google.com"); |
| 927 | 927 |
| 928 // Set up QUIC as alternative_service. | 928 // Set up QUIC as alternative_service. |
| 929 HttpServerPropertiesImpl http_server_properties; | 929 HttpServerPropertiesImpl http_server_properties; |
| 930 const AlternativeService alternative_service(QUIC, "www.google.com", 443); | 930 const AlternativeService alternative_service(QUIC, "www.google.com", 443); |
| 931 AlternativeServiceInfoVector alternative_service_info_vector; | 931 AlternativeServiceInfoVector alternative_service_info_vector; |
| 932 base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); | 932 base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); |
| 933 alternative_service_info_vector.push_back( | 933 alternative_service_info_vector.push_back( |
| 934 AlternativeServiceInfo(alternative_service, 1.0, expiration)); | 934 AlternativeServiceInfo(alternative_service, expiration)); |
| 935 HostPortPair host_port_pair(alternative_service.host_port_pair()); | 935 HostPortPair host_port_pair(alternative_service.host_port_pair()); |
| 936 http_server_properties.SetAlternativeServices( | 936 http_server_properties.SetAlternativeServices( |
| 937 host_port_pair, alternative_service_info_vector); | 937 host_port_pair, alternative_service_info_vector); |
| 938 | 938 |
| 939 SpdySessionDependencies session_deps(GetParam()); | 939 SpdySessionDependencies session_deps(GetParam()); |
| 940 | 940 |
| 941 // Setup params to disable preconnect, but QUIC does 0RTT. | 941 // Setup params to disable preconnect, but QUIC does 0RTT. |
| 942 HttpNetworkSession::Params params = | 942 HttpNetworkSession::Params params = |
| 943 SpdySessionDependencies::CreateSessionParams(&session_deps); | 943 SpdySessionDependencies::CreateSessionParams(&session_deps); |
| 944 params.enable_quic = true; | 944 params.enable_quic = true; |
| (...skipping 612 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1557 params_.client_socket_factory = &socket_factory_; | 1557 params_.client_socket_factory = &socket_factory_; |
| 1558 session_.reset(new HttpNetworkSession(params_)); | 1558 session_.reset(new HttpNetworkSession(params_)); |
| 1559 session_->quic_stream_factory()->set_require_confirmation(false); | 1559 session_->quic_stream_factory()->set_require_confirmation(false); |
| 1560 } | 1560 } |
| 1561 | 1561 |
| 1562 void AddQuicAlternativeService() { | 1562 void AddQuicAlternativeService() { |
| 1563 const AlternativeService alternative_service(QUIC, "www.example.org", 443); | 1563 const AlternativeService alternative_service(QUIC, "www.example.org", 443); |
| 1564 AlternativeServiceInfoVector alternative_service_info_vector; | 1564 AlternativeServiceInfoVector alternative_service_info_vector; |
| 1565 base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); | 1565 base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); |
| 1566 alternative_service_info_vector.push_back( | 1566 alternative_service_info_vector.push_back( |
| 1567 AlternativeServiceInfo(alternative_service, 1.0, expiration)); | 1567 AlternativeServiceInfo(alternative_service, expiration)); |
| 1568 HostPortPair host_port_pair(alternative_service.host_port_pair()); | 1568 HostPortPair host_port_pair(alternative_service.host_port_pair()); |
| 1569 http_server_properties_.SetAlternativeServices( | 1569 http_server_properties_.SetAlternativeServices( |
| 1570 host_port_pair, alternative_service_info_vector); | 1570 host_port_pair, alternative_service_info_vector); |
| 1571 }; | 1571 }; |
| 1572 | 1572 |
| 1573 test::QuicTestPacketMaker& packet_maker() { return packet_maker_; } | 1573 test::QuicTestPacketMaker& packet_maker() { return packet_maker_; } |
| 1574 | 1574 |
| 1575 MockClientSocketFactory& socket_factory() { return socket_factory_; } | 1575 MockClientSocketFactory& socket_factory() { return socket_factory_; } |
| 1576 | 1576 |
| 1577 HttpNetworkSession* session() { return session_.get(); } | 1577 HttpNetworkSession* session() { return session_.get(); } |
| (...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1881 | 1881 |
| 1882 // Now request a stream. | 1882 // Now request a stream. |
| 1883 HttpRequestInfo request_info; | 1883 HttpRequestInfo request_info; |
| 1884 request_info.method = "GET"; | 1884 request_info.method = "GET"; |
| 1885 request_info.url = GURL("ws://www.google.com:8888"); | 1885 request_info.url = GURL("ws://www.google.com:8888"); |
| 1886 request_info.load_flags = 0; | 1886 request_info.load_flags = 0; |
| 1887 | 1887 |
| 1888 base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); | 1888 base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); |
| 1889 session->http_server_properties()->SetAlternativeService( | 1889 session->http_server_properties()->SetAlternativeService( |
| 1890 HostPortPair("www.google.com", 8888), | 1890 HostPortPair("www.google.com", 8888), |
| 1891 AlternativeService(NPN_HTTP_2, "www.google.com", 9999), 1.0, expiration); | 1891 AlternativeService(NPN_HTTP_2, "www.google.com", 9999), expiration); |
| 1892 | 1892 |
| 1893 SSLConfig ssl_config; | 1893 SSLConfig ssl_config; |
| 1894 StreamRequestWaiter waiter; | 1894 StreamRequestWaiter waiter; |
| 1895 WebSocketStreamCreateHelper create_helper; | 1895 WebSocketStreamCreateHelper create_helper; |
| 1896 scoped_ptr<HttpStreamRequest> request( | 1896 scoped_ptr<HttpStreamRequest> request( |
| 1897 session->http_stream_factory_for_websocket() | 1897 session->http_stream_factory_for_websocket() |
| 1898 ->RequestWebSocketHandshakeStream(request_info, | 1898 ->RequestWebSocketHandshakeStream(request_info, |
| 1899 DEFAULT_PRIORITY, | 1899 DEFAULT_PRIORITY, |
| 1900 ssl_config, | 1900 ssl_config, |
| 1901 ssl_config, | 1901 ssl_config, |
| (...skipping 21 matching lines...) Expand all Loading... |
| 1923 EXPECT_TRUE(waiter.used_proxy_info().is_direct()); | 1923 EXPECT_TRUE(waiter.used_proxy_info().is_direct()); |
| 1924 | 1924 |
| 1925 // Make sure there is no orphaned job. it is already canceled. | 1925 // Make sure there is no orphaned job. it is already canceled. |
| 1926 ASSERT_EQ(0u, static_cast<HttpStreamFactoryImpl*>( | 1926 ASSERT_EQ(0u, static_cast<HttpStreamFactoryImpl*>( |
| 1927 session->http_stream_factory_for_websocket())->num_orphaned_jobs()); | 1927 session->http_stream_factory_for_websocket())->num_orphaned_jobs()); |
| 1928 } | 1928 } |
| 1929 | 1929 |
| 1930 } // namespace | 1930 } // namespace |
| 1931 | 1931 |
| 1932 } // namespace net | 1932 } // namespace net |
| OLD | NEW |