| Index: net/http/http_stream_factory_impl_unittest.cc
|
| diff --git a/net/http/http_stream_factory_impl_unittest.cc b/net/http/http_stream_factory_impl_unittest.cc
|
| index d6daa23dcd60195f722892cc88d3b477911114d9..983d4113b637f9abf85fc13c596703fa35afde94 100644
|
| --- a/net/http/http_stream_factory_impl_unittest.cc
|
| +++ b/net/http/http_stream_factory_impl_unittest.cc
|
| @@ -68,9 +68,7 @@ class MockWebSocketHandshakeStream : public WebSocketHandshakeStreamBase {
|
|
|
| virtual ~MockWebSocketHandshakeStream() {}
|
|
|
| - StreamType type() const {
|
| - return type_;
|
| - }
|
| + StreamType type() const { return type_; }
|
|
|
| // HttpStreamBase methods
|
| virtual int InitializeStream(const HttpRequestInfo* request_info,
|
| @@ -102,8 +100,8 @@ class MockWebSocketHandshakeStream : public WebSocketHandshakeStreamBase {
|
| virtual void SetConnectionReused() OVERRIDE {}
|
| virtual bool IsConnectionReusable() const OVERRIDE { return false; }
|
| virtual int64 GetTotalReceivedBytes() const OVERRIDE { return 0; }
|
| - virtual bool GetLoadTimingInfo(LoadTimingInfo* load_timing_info) const
|
| - OVERRIDE {
|
| + virtual bool GetLoadTimingInfo(
|
| + LoadTimingInfo* load_timing_info) const OVERRIDE {
|
| return false;
|
| }
|
| virtual void GetSSLInfo(SSLInfo* ssl_info) OVERRIDE {}
|
| @@ -134,7 +132,6 @@ class MockHttpStreamFactoryImplForPreconnect : public HttpStreamFactoryImpl {
|
| preconnect_done_(false),
|
| waiting_for_preconnect_(false) {}
|
|
|
| -
|
| void WaitForPreconnects() {
|
| while (!preconnect_done_) {
|
| waiting_for_preconnect_ = true;
|
| @@ -157,16 +154,13 @@ class MockHttpStreamFactoryImplForPreconnect : public HttpStreamFactoryImpl {
|
|
|
| class StreamRequestWaiter : public HttpStreamRequest::Delegate {
|
| public:
|
| - StreamRequestWaiter()
|
| - : waiting_for_stream_(false),
|
| - stream_done_(false) {}
|
| + StreamRequestWaiter() : waiting_for_stream_(false), stream_done_(false) {}
|
|
|
| // HttpStreamRequest::Delegate
|
|
|
| - virtual void OnStreamReady(
|
| - const SSLConfig& used_ssl_config,
|
| - const ProxyInfo& used_proxy_info,
|
| - HttpStreamBase* stream) OVERRIDE {
|
| + virtual void OnStreamReady(const SSLConfig& used_ssl_config,
|
| + const ProxyInfo& used_proxy_info,
|
| + HttpStreamBase* stream) OVERRIDE {
|
| stream_done_ = true;
|
| if (waiting_for_stream_)
|
| base::MessageLoop::current()->Quit();
|
| @@ -187,14 +181,12 @@ class StreamRequestWaiter : public HttpStreamRequest::Delegate {
|
| used_proxy_info_ = used_proxy_info;
|
| }
|
|
|
| - virtual void OnStreamFailed(
|
| - int status,
|
| - const SSLConfig& used_ssl_config) OVERRIDE {}
|
| + virtual void OnStreamFailed(int status,
|
| + const SSLConfig& used_ssl_config) OVERRIDE {}
|
|
|
| - virtual void OnCertificateError(
|
| - int status,
|
| - const SSLConfig& used_ssl_config,
|
| - const SSLInfo& ssl_info) OVERRIDE {}
|
| + virtual void OnCertificateError(int status,
|
| + const SSLConfig& used_ssl_config,
|
| + const SSLInfo& ssl_info) OVERRIDE {}
|
|
|
| virtual void OnNeedsProxyAuth(const HttpResponseInfo& proxy_response,
|
| const SSLConfig& used_ssl_config,
|
| @@ -217,17 +209,11 @@ class StreamRequestWaiter : public HttpStreamRequest::Delegate {
|
| }
|
| }
|
|
|
| - const SSLConfig& used_ssl_config() const {
|
| - return used_ssl_config_;
|
| - }
|
| + const SSLConfig& used_ssl_config() const { return used_ssl_config_; }
|
|
|
| - const ProxyInfo& used_proxy_info() const {
|
| - return used_proxy_info_;
|
| - }
|
| + const ProxyInfo& used_proxy_info() const { return used_proxy_info_; }
|
|
|
| - HttpStreamBase* stream() {
|
| - return stream_.get();
|
| - }
|
| + HttpStreamBase* stream() { return stream_.get(); }
|
|
|
| MockWebSocketHandshakeStream* websocket_stream() {
|
| return static_cast<MockWebSocketHandshakeStream*>(websocket_stream_.get());
|
| @@ -302,10 +288,10 @@ struct TestCase {
|
| };
|
|
|
| TestCase kTests[] = {
|
| - { 1, false },
|
| - { 2, false },
|
| - { 1, true},
|
| - { 2, true},
|
| + {1, false},
|
| + {2, false},
|
| + {1, true},
|
| + {2, true},
|
| };
|
|
|
| void PreconnectHelperForURL(int num_streams,
|
| @@ -328,22 +314,19 @@ void PreconnectHelperForURL(int num_streams,
|
| mock_factory->WaitForPreconnects();
|
| };
|
|
|
| -void PreconnectHelper(const TestCase& test,
|
| - HttpNetworkSession* session) {
|
| - GURL url = test.ssl ? GURL("https://www.google.com") :
|
| - GURL("http://www.google.com");
|
| +void PreconnectHelper(const TestCase& test, HttpNetworkSession* session) {
|
| + GURL url =
|
| + test.ssl ? GURL("https://www.google.com") : GURL("http://www.google.com");
|
| PreconnectHelperForURL(test.num_streams, url, session);
|
| };
|
|
|
| -template<typename ParentPool>
|
| +template <typename ParentPool>
|
| class CapturePreconnectsSocketPool : public ParentPool {
|
| public:
|
| CapturePreconnectsSocketPool(HostResolver* host_resolver,
|
| CertVerifier* cert_verifier);
|
|
|
| - int last_num_streams() const {
|
| - return last_num_streams_;
|
| - }
|
| + int last_num_streams() const { return last_num_streams_; }
|
|
|
| virtual int RequestSocket(const std::string& group_name,
|
| const void* socket_params,
|
| @@ -371,9 +354,7 @@ class CapturePreconnectsSocketPool : public ParentPool {
|
| int id) OVERRIDE {
|
| ADD_FAILURE();
|
| }
|
| - virtual void CloseIdleSockets() OVERRIDE {
|
| - ADD_FAILURE();
|
| - }
|
| + virtual void CloseIdleSockets() OVERRIDE { ADD_FAILURE(); }
|
| virtual int IdleSocketCount() const OVERRIDE {
|
| ADD_FAILURE();
|
| return 0;
|
| @@ -398,25 +379,28 @@ class CapturePreconnectsSocketPool : public ParentPool {
|
| };
|
|
|
| typedef CapturePreconnectsSocketPool<TransportClientSocketPool>
|
| -CapturePreconnectsTransportSocketPool;
|
| + CapturePreconnectsTransportSocketPool;
|
| typedef CapturePreconnectsSocketPool<HttpProxyClientSocketPool>
|
| -CapturePreconnectsHttpProxySocketPool;
|
| + CapturePreconnectsHttpProxySocketPool;
|
| typedef CapturePreconnectsSocketPool<SOCKSClientSocketPool>
|
| -CapturePreconnectsSOCKSSocketPool;
|
| + CapturePreconnectsSOCKSSocketPool;
|
| typedef CapturePreconnectsSocketPool<SSLClientSocketPool>
|
| -CapturePreconnectsSSLSocketPool;
|
| + CapturePreconnectsSSLSocketPool;
|
|
|
| -template<typename ParentPool>
|
| +template <typename ParentPool>
|
| CapturePreconnectsSocketPool<ParentPool>::CapturePreconnectsSocketPool(
|
| - HostResolver* host_resolver, CertVerifier* /* cert_verifier */)
|
| - : ParentPool(0, 0, NULL, host_resolver, NULL, NULL),
|
| - last_num_streams_(-1) {}
|
| + HostResolver* host_resolver,
|
| + CertVerifier* /* cert_verifier */)
|
| + : ParentPool(0, 0, NULL, host_resolver, NULL, NULL), last_num_streams_(-1) {
|
| +}
|
|
|
| -template<>
|
| +template <>
|
| CapturePreconnectsHttpProxySocketPool::CapturePreconnectsSocketPool(
|
| - HostResolver* host_resolver, CertVerifier* /* cert_verifier */)
|
| + HostResolver* host_resolver,
|
| + CertVerifier* /* cert_verifier */)
|
| : HttpProxyClientSocketPool(0, 0, NULL, host_resolver, NULL, NULL, NULL),
|
| - last_num_streams_(-1) {}
|
| + last_num_streams_(-1) {
|
| +}
|
|
|
| template <>
|
| CapturePreconnectsSSLSocketPool::CapturePreconnectsSocketPool(
|
| @@ -424,7 +408,7 @@ CapturePreconnectsSSLSocketPool::CapturePreconnectsSocketPool(
|
| CertVerifier* cert_verifier)
|
| : SSLClientSocketPool(0,
|
| 0,
|
| - NULL, // ssl_histograms
|
| + NULL, // ssl_histograms
|
| host_resolver,
|
| cert_verifier,
|
| NULL, // server_bound_cert_store
|
| @@ -435,35 +419,35 @@ CapturePreconnectsSSLSocketPool::CapturePreconnectsSocketPool(
|
| NULL, // transport_socket_pool
|
| NULL,
|
| NULL,
|
| - NULL, // ssl_config_service
|
| - NULL), // net_log
|
| - last_num_streams_(-1) {}
|
| + NULL, // ssl_config_service
|
| + NULL), // net_log
|
| + last_num_streams_(-1) {
|
| +}
|
|
|
| class HttpStreamFactoryTest : public ::testing::Test,
|
| public ::testing::WithParamInterface<NextProto> {
|
| };
|
|
|
| -INSTANTIATE_TEST_CASE_P(
|
| - NextProto,
|
| - HttpStreamFactoryTest,
|
| - testing::Values(kProtoDeprecatedSPDY2,
|
| - kProtoSPDY3, kProtoSPDY31, kProtoSPDY4));
|
| +INSTANTIATE_TEST_CASE_P(NextProto,
|
| + HttpStreamFactoryTest,
|
| + testing::Values(kProtoDeprecatedSPDY2,
|
| + kProtoSPDY3,
|
| + kProtoSPDY31,
|
| + kProtoSPDY4));
|
|
|
| TEST_P(HttpStreamFactoryTest, PreconnectDirect) {
|
| for (size_t i = 0; i < arraysize(kTests); ++i) {
|
| - SpdySessionDependencies session_deps(
|
| - GetParam(), ProxyService::CreateDirect());
|
| + SpdySessionDependencies session_deps(GetParam(),
|
| + ProxyService::CreateDirect());
|
| scoped_refptr<HttpNetworkSession> session(
|
| SpdySessionDependencies::SpdyCreateSession(&session_deps));
|
| HttpNetworkSessionPeer peer(session);
|
| CapturePreconnectsTransportSocketPool* transport_conn_pool =
|
| new CapturePreconnectsTransportSocketPool(
|
| - session_deps.host_resolver.get(),
|
| - session_deps.cert_verifier.get());
|
| + session_deps.host_resolver.get(), session_deps.cert_verifier.get());
|
| CapturePreconnectsSSLSocketPool* ssl_conn_pool =
|
| - new CapturePreconnectsSSLSocketPool(
|
| - session_deps.host_resolver.get(),
|
| - session_deps.cert_verifier.get());
|
| + new CapturePreconnectsSSLSocketPool(session_deps.host_resolver.get(),
|
| + session_deps.cert_verifier.get());
|
| scoped_ptr<MockClientSocketPoolManager> mock_pool_manager(
|
| new MockClientSocketPoolManager);
|
| mock_pool_manager->SetTransportSocketPool(transport_conn_pool);
|
| @@ -488,12 +472,10 @@ TEST_P(HttpStreamFactoryTest, PreconnectHttpProxy) {
|
| HostPortPair proxy_host("http_proxy", 80);
|
| CapturePreconnectsHttpProxySocketPool* http_proxy_pool =
|
| new CapturePreconnectsHttpProxySocketPool(
|
| - session_deps.host_resolver.get(),
|
| - session_deps.cert_verifier.get());
|
| + session_deps.host_resolver.get(), session_deps.cert_verifier.get());
|
| CapturePreconnectsSSLSocketPool* ssl_conn_pool =
|
| - new CapturePreconnectsSSLSocketPool(
|
| - session_deps.host_resolver.get(),
|
| - session_deps.cert_verifier.get());
|
| + new CapturePreconnectsSSLSocketPool(session_deps.host_resolver.get(),
|
| + session_deps.cert_verifier.get());
|
| scoped_ptr<MockClientSocketPoolManager> mock_pool_manager(
|
| new MockClientSocketPoolManager);
|
| mock_pool_manager->SetSocketPoolForHTTPProxy(proxy_host, http_proxy_pool);
|
| @@ -517,13 +499,11 @@ TEST_P(HttpStreamFactoryTest, PreconnectSocksProxy) {
|
| HttpNetworkSessionPeer peer(session);
|
| HostPortPair proxy_host("socks_proxy", 1080);
|
| CapturePreconnectsSOCKSSocketPool* socks_proxy_pool =
|
| - new CapturePreconnectsSOCKSSocketPool(
|
| - session_deps.host_resolver.get(),
|
| - session_deps.cert_verifier.get());
|
| + new CapturePreconnectsSOCKSSocketPool(session_deps.host_resolver.get(),
|
| + session_deps.cert_verifier.get());
|
| CapturePreconnectsSSLSocketPool* ssl_conn_pool =
|
| - new CapturePreconnectsSSLSocketPool(
|
| - session_deps.host_resolver.get(),
|
| - session_deps.cert_verifier.get());
|
| + new CapturePreconnectsSSLSocketPool(session_deps.host_resolver.get(),
|
| + session_deps.cert_verifier.get());
|
| scoped_ptr<MockClientSocketPoolManager> mock_pool_manager(
|
| new MockClientSocketPoolManager);
|
| mock_pool_manager->SetSocketPoolForSOCKSProxy(proxy_host, socks_proxy_pool);
|
| @@ -540,26 +520,24 @@ TEST_P(HttpStreamFactoryTest, PreconnectSocksProxy) {
|
|
|
| TEST_P(HttpStreamFactoryTest, PreconnectDirectWithExistingSpdySession) {
|
| for (size_t i = 0; i < arraysize(kTests); ++i) {
|
| - SpdySessionDependencies session_deps(
|
| - GetParam(), ProxyService::CreateDirect());
|
| + SpdySessionDependencies session_deps(GetParam(),
|
| + ProxyService::CreateDirect());
|
| scoped_refptr<HttpNetworkSession> session(
|
| SpdySessionDependencies::SpdyCreateSession(&session_deps));
|
| HttpNetworkSessionPeer peer(session);
|
|
|
| // Put a SpdySession in the pool.
|
| HostPortPair host_port_pair("www.google.com", 443);
|
| - SpdySessionKey key(host_port_pair, ProxyServer::Direct(),
|
| - PRIVACY_MODE_DISABLED);
|
| + SpdySessionKey key(
|
| + host_port_pair, ProxyServer::Direct(), PRIVACY_MODE_DISABLED);
|
| ignore_result(CreateFakeSpdySession(session->spdy_session_pool(), key));
|
|
|
| CapturePreconnectsTransportSocketPool* transport_conn_pool =
|
| new CapturePreconnectsTransportSocketPool(
|
| - session_deps.host_resolver.get(),
|
| - session_deps.cert_verifier.get());
|
| + session_deps.host_resolver.get(), session_deps.cert_verifier.get());
|
| CapturePreconnectsSSLSocketPool* ssl_conn_pool =
|
| - new CapturePreconnectsSSLSocketPool(
|
| - session_deps.host_resolver.get(),
|
| - session_deps.cert_verifier.get());
|
| + new CapturePreconnectsSSLSocketPool(session_deps.host_resolver.get(),
|
| + session_deps.cert_verifier.get());
|
| scoped_ptr<MockClientSocketPoolManager> mock_pool_manager(
|
| new MockClientSocketPoolManager);
|
| mock_pool_manager->SetTransportSocketPool(transport_conn_pool);
|
| @@ -572,8 +550,7 @@ TEST_P(HttpStreamFactoryTest, PreconnectDirectWithExistingSpdySession) {
|
| if (kTests[i].ssl)
|
| EXPECT_EQ(-1, ssl_conn_pool->last_num_streams());
|
| else
|
| - EXPECT_EQ(kTests[i].num_streams,
|
| - transport_conn_pool->last_num_streams());
|
| + EXPECT_EQ(kTests[i].num_streams, transport_conn_pool->last_num_streams());
|
| }
|
| }
|
|
|
| @@ -583,15 +560,14 @@ TEST_P(HttpStreamFactoryTest, PreconnectUnsafePort) {
|
| ASSERT_FALSE(IsPortAllowedByDefault(7));
|
| ASSERT_FALSE(IsPortAllowedByOverride(7));
|
|
|
| - SpdySessionDependencies session_deps(
|
| - GetParam(), ProxyService::CreateDirect());
|
| + SpdySessionDependencies session_deps(GetParam(),
|
| + ProxyService::CreateDirect());
|
| scoped_refptr<HttpNetworkSession> session(
|
| SpdySessionDependencies::SpdyCreateSession(&session_deps));
|
| HttpNetworkSessionPeer peer(session);
|
| CapturePreconnectsTransportSocketPool* transport_conn_pool =
|
| new CapturePreconnectsTransportSocketPool(
|
| - session_deps.host_resolver.get(),
|
| - session_deps.cert_verifier.get());
|
| + session_deps.host_resolver.get(), session_deps.cert_verifier.get());
|
| scoped_ptr<MockClientSocketPoolManager> mock_pool_manager(
|
| new MockClientSocketPoolManager);
|
| mock_pool_manager->SetTransportSocketPool(transport_conn_pool);
|
| @@ -630,9 +606,12 @@ TEST_P(HttpStreamFactoryTest, JobNotifiesProxy) {
|
| SSLConfig ssl_config;
|
| StreamRequestWaiter waiter;
|
| scoped_ptr<HttpStreamRequest> request(
|
| - session->http_stream_factory()->RequestStream(
|
| - request_info, DEFAULT_PRIORITY, ssl_config, ssl_config,
|
| - &waiter, BoundNetLog()));
|
| + session->http_stream_factory()->RequestStream(request_info,
|
| + DEFAULT_PRIORITY,
|
| + ssl_config,
|
| + ssl_config,
|
| + &waiter,
|
| + BoundNetLog()));
|
| waiter.WaitForStream();
|
|
|
| // The proxy that failed should now be known to the proxy_service as bad.
|
| @@ -644,8 +623,8 @@ TEST_P(HttpStreamFactoryTest, JobNotifiesProxy) {
|
| }
|
|
|
| TEST_P(HttpStreamFactoryTest, PrivacyModeDisablesChannelId) {
|
| - SpdySessionDependencies session_deps(
|
| - GetParam(), ProxyService::CreateDirect());
|
| + SpdySessionDependencies session_deps(GetParam(),
|
| + ProxyService::CreateDirect());
|
|
|
| StaticSocketDataProvider socket_data;
|
| socket_data.set_connect_data(MockConnect(ASYNC, OK));
|
| @@ -659,8 +638,8 @@ TEST_P(HttpStreamFactoryTest, PrivacyModeDisablesChannelId) {
|
|
|
| // Set an existing SpdySession in the pool.
|
| HostPortPair host_port_pair("www.google.com", 443);
|
| - SpdySessionKey key(host_port_pair, ProxyServer::Direct(),
|
| - PRIVACY_MODE_ENABLED);
|
| + SpdySessionKey key(
|
| + host_port_pair, ProxyServer::Direct(), PRIVACY_MODE_ENABLED);
|
|
|
| HttpRequestInfo request_info;
|
| request_info.method = "GET";
|
| @@ -671,9 +650,12 @@ TEST_P(HttpStreamFactoryTest, PrivacyModeDisablesChannelId) {
|
| SSLConfig ssl_config;
|
| StreamRequestWaiter waiter;
|
| scoped_ptr<HttpStreamRequest> request(
|
| - session->http_stream_factory()->RequestStream(
|
| - request_info, DEFAULT_PRIORITY, ssl_config, ssl_config,
|
| - &waiter, BoundNetLog()));
|
| + session->http_stream_factory()->RequestStream(request_info,
|
| + DEFAULT_PRIORITY,
|
| + ssl_config,
|
| + ssl_config,
|
| + &waiter,
|
| + BoundNetLog()));
|
| waiter.WaitForStream();
|
|
|
| // The stream shouldn't come from spdy as we are using different privacy mode
|
| @@ -698,8 +680,8 @@ int GetSocketPoolGroupCount(ClientSocketPool* pool) {
|
| } // namespace
|
|
|
| TEST_P(HttpStreamFactoryTest, PrivacyModeUsesDifferentSocketPoolGroup) {
|
| - SpdySessionDependencies session_deps(
|
| - GetParam(), ProxyService::CreateDirect());
|
| + SpdySessionDependencies session_deps(GetParam(),
|
| + ProxyService::CreateDirect());
|
|
|
| StaticSocketDataProvider socket_data;
|
| socket_data.set_connect_data(MockConnect(ASYNC, OK));
|
| @@ -710,8 +692,8 @@ TEST_P(HttpStreamFactoryTest, PrivacyModeUsesDifferentSocketPoolGroup) {
|
|
|
| scoped_refptr<HttpNetworkSession> session(
|
| SpdySessionDependencies::SpdyCreateSession(&session_deps));
|
| - SSLClientSocketPool* ssl_pool = session->GetSSLSocketPool(
|
| - HttpNetworkSession::NORMAL_SOCKET_POOL);
|
| + SSLClientSocketPool* ssl_pool =
|
| + session->GetSSLSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL);
|
|
|
| EXPECT_EQ(GetSocketPoolGroupCount(ssl_pool), 0);
|
|
|
| @@ -725,34 +707,43 @@ TEST_P(HttpStreamFactoryTest, PrivacyModeUsesDifferentSocketPoolGroup) {
|
| StreamRequestWaiter waiter;
|
|
|
| scoped_ptr<HttpStreamRequest> request1(
|
| - session->http_stream_factory()->RequestStream(
|
| - request_info, DEFAULT_PRIORITY, ssl_config, ssl_config,
|
| - &waiter, BoundNetLog()));
|
| + session->http_stream_factory()->RequestStream(request_info,
|
| + DEFAULT_PRIORITY,
|
| + ssl_config,
|
| + ssl_config,
|
| + &waiter,
|
| + BoundNetLog()));
|
| waiter.WaitForStream();
|
|
|
| EXPECT_EQ(GetSocketPoolGroupCount(ssl_pool), 1);
|
|
|
| scoped_ptr<HttpStreamRequest> request2(
|
| - session->http_stream_factory()->RequestStream(
|
| - request_info, DEFAULT_PRIORITY, ssl_config, ssl_config,
|
| - &waiter, BoundNetLog()));
|
| + session->http_stream_factory()->RequestStream(request_info,
|
| + DEFAULT_PRIORITY,
|
| + ssl_config,
|
| + ssl_config,
|
| + &waiter,
|
| + BoundNetLog()));
|
| waiter.WaitForStream();
|
|
|
| EXPECT_EQ(GetSocketPoolGroupCount(ssl_pool), 1);
|
|
|
| request_info.privacy_mode = PRIVACY_MODE_ENABLED;
|
| scoped_ptr<HttpStreamRequest> request3(
|
| - session->http_stream_factory()->RequestStream(
|
| - request_info, DEFAULT_PRIORITY, ssl_config, ssl_config,
|
| - &waiter, BoundNetLog()));
|
| + session->http_stream_factory()->RequestStream(request_info,
|
| + DEFAULT_PRIORITY,
|
| + ssl_config,
|
| + ssl_config,
|
| + &waiter,
|
| + BoundNetLog()));
|
| waiter.WaitForStream();
|
|
|
| EXPECT_EQ(GetSocketPoolGroupCount(ssl_pool), 2);
|
| }
|
|
|
| TEST_P(HttpStreamFactoryTest, GetLoadState) {
|
| - SpdySessionDependencies session_deps(
|
| - GetParam(), ProxyService::CreateDirect());
|
| + SpdySessionDependencies session_deps(GetParam(),
|
| + ProxyService::CreateDirect());
|
|
|
| StaticSocketDataProvider socket_data;
|
| socket_data.set_connect_data(MockConnect(ASYNC, OK));
|
| @@ -768,9 +759,12 @@ TEST_P(HttpStreamFactoryTest, GetLoadState) {
|
| SSLConfig ssl_config;
|
| StreamRequestWaiter waiter;
|
| scoped_ptr<HttpStreamRequest> request(
|
| - session->http_stream_factory()->RequestStream(
|
| - request_info, DEFAULT_PRIORITY, ssl_config, ssl_config,
|
| - &waiter, BoundNetLog()));
|
| + session->http_stream_factory()->RequestStream(request_info,
|
| + DEFAULT_PRIORITY,
|
| + ssl_config,
|
| + ssl_config,
|
| + &waiter,
|
| + BoundNetLog()));
|
|
|
| EXPECT_EQ(LOAD_STATE_RESOLVING_HOST, request->GetLoadState());
|
|
|
| @@ -778,8 +772,8 @@ TEST_P(HttpStreamFactoryTest, GetLoadState) {
|
| }
|
|
|
| TEST_P(HttpStreamFactoryTest, RequestHttpStream) {
|
| - SpdySessionDependencies session_deps(
|
| - GetParam(), ProxyService::CreateDirect());
|
| + SpdySessionDependencies session_deps(GetParam(),
|
| + ProxyService::CreateDirect());
|
|
|
| StaticSocketDataProvider socket_data;
|
| socket_data.set_connect_data(MockConnect(ASYNC, OK));
|
| @@ -798,34 +792,36 @@ TEST_P(HttpStreamFactoryTest, RequestHttpStream) {
|
| SSLConfig ssl_config;
|
| StreamRequestWaiter waiter;
|
| scoped_ptr<HttpStreamRequest> request(
|
| - session->http_stream_factory()->RequestStream(
|
| - request_info,
|
| - DEFAULT_PRIORITY,
|
| - ssl_config,
|
| - ssl_config,
|
| - &waiter,
|
| - BoundNetLog()));
|
| + session->http_stream_factory()->RequestStream(request_info,
|
| + DEFAULT_PRIORITY,
|
| + ssl_config,
|
| + ssl_config,
|
| + &waiter,
|
| + BoundNetLog()));
|
| waiter.WaitForStream();
|
| EXPECT_TRUE(waiter.stream_done());
|
| ASSERT_TRUE(NULL != waiter.stream());
|
| EXPECT_TRUE(NULL == waiter.websocket_stream());
|
| EXPECT_FALSE(waiter.stream()->IsSpdyHttpStream());
|
|
|
| - EXPECT_EQ(1, GetSocketPoolGroupCount(
|
| - session->GetTransportSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL)));
|
| - EXPECT_EQ(0, GetSocketPoolGroupCount(session->GetSSLSocketPool(
|
| - HttpNetworkSession::NORMAL_SOCKET_POOL)));
|
| - EXPECT_EQ(0, GetSocketPoolGroupCount(
|
| - session->GetTransportSocketPool(
|
| - HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
|
| - EXPECT_EQ(0, GetSocketPoolGroupCount(session->GetSSLSocketPool(
|
| - HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
|
| + EXPECT_EQ(1,
|
| + GetSocketPoolGroupCount(session->GetTransportSocketPool(
|
| + HttpNetworkSession::NORMAL_SOCKET_POOL)));
|
| + EXPECT_EQ(0,
|
| + GetSocketPoolGroupCount(session->GetSSLSocketPool(
|
| + HttpNetworkSession::NORMAL_SOCKET_POOL)));
|
| + EXPECT_EQ(0,
|
| + GetSocketPoolGroupCount(session->GetTransportSocketPool(
|
| + HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
|
| + EXPECT_EQ(0,
|
| + GetSocketPoolGroupCount(session->GetSSLSocketPool(
|
| + HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
|
| EXPECT_TRUE(waiter.used_proxy_info().is_direct());
|
| }
|
|
|
| TEST_P(HttpStreamFactoryTest, RequestHttpStreamOverSSL) {
|
| - SpdySessionDependencies session_deps(
|
| - GetParam(), ProxyService::CreateDirect());
|
| + SpdySessionDependencies session_deps(GetParam(),
|
| + ProxyService::CreateDirect());
|
|
|
| MockRead mock_read(ASYNC, OK);
|
| StaticSocketDataProvider socket_data(&mock_read, 1, NULL, 0);
|
| @@ -847,27 +843,29 @@ TEST_P(HttpStreamFactoryTest, RequestHttpStreamOverSSL) {
|
| SSLConfig ssl_config;
|
| StreamRequestWaiter waiter;
|
| scoped_ptr<HttpStreamRequest> request(
|
| - session->http_stream_factory()->RequestStream(
|
| - request_info,
|
| - DEFAULT_PRIORITY,
|
| - ssl_config,
|
| - ssl_config,
|
| - &waiter,
|
| - BoundNetLog()));
|
| + session->http_stream_factory()->RequestStream(request_info,
|
| + DEFAULT_PRIORITY,
|
| + ssl_config,
|
| + ssl_config,
|
| + &waiter,
|
| + BoundNetLog()));
|
| waiter.WaitForStream();
|
| EXPECT_TRUE(waiter.stream_done());
|
| ASSERT_TRUE(NULL != waiter.stream());
|
| EXPECT_TRUE(NULL == waiter.websocket_stream());
|
| EXPECT_FALSE(waiter.stream()->IsSpdyHttpStream());
|
| - EXPECT_EQ(1, GetSocketPoolGroupCount(
|
| - session->GetTransportSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL)));
|
| - EXPECT_EQ(1, GetSocketPoolGroupCount(
|
| - session->GetSSLSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL)));
|
| - EXPECT_EQ(0, GetSocketPoolGroupCount(
|
| - session->GetTransportSocketPool(
|
| - HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
|
| - EXPECT_EQ(0, GetSocketPoolGroupCount(session->GetSSLSocketPool(
|
| - HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
|
| + EXPECT_EQ(1,
|
| + GetSocketPoolGroupCount(session->GetTransportSocketPool(
|
| + HttpNetworkSession::NORMAL_SOCKET_POOL)));
|
| + EXPECT_EQ(1,
|
| + GetSocketPoolGroupCount(session->GetSSLSocketPool(
|
| + HttpNetworkSession::NORMAL_SOCKET_POOL)));
|
| + EXPECT_EQ(0,
|
| + GetSocketPoolGroupCount(session->GetTransportSocketPool(
|
| + HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
|
| + EXPECT_EQ(0,
|
| + GetSocketPoolGroupCount(session->GetSSLSocketPool(
|
| + HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
|
| EXPECT_TRUE(waiter.used_proxy_info().is_direct());
|
| }
|
|
|
| @@ -892,40 +890,45 @@ TEST_P(HttpStreamFactoryTest, RequestHttpStreamOverProxy) {
|
| SSLConfig ssl_config;
|
| StreamRequestWaiter waiter;
|
| scoped_ptr<HttpStreamRequest> request(
|
| - session->http_stream_factory()->RequestStream(
|
| - request_info,
|
| - DEFAULT_PRIORITY,
|
| - ssl_config,
|
| - ssl_config,
|
| - &waiter,
|
| - BoundNetLog()));
|
| + session->http_stream_factory()->RequestStream(request_info,
|
| + DEFAULT_PRIORITY,
|
| + ssl_config,
|
| + ssl_config,
|
| + &waiter,
|
| + BoundNetLog()));
|
| waiter.WaitForStream();
|
| EXPECT_TRUE(waiter.stream_done());
|
| ASSERT_TRUE(NULL != waiter.stream());
|
| EXPECT_TRUE(NULL == waiter.websocket_stream());
|
| EXPECT_FALSE(waiter.stream()->IsSpdyHttpStream());
|
| - EXPECT_EQ(0, GetSocketPoolGroupCount(
|
| - session->GetTransportSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL)));
|
| - EXPECT_EQ(0, GetSocketPoolGroupCount(
|
| - session->GetSSLSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL)));
|
| - EXPECT_EQ(1, GetSocketPoolGroupCount(session->GetSocketPoolForHTTPProxy(
|
| - HttpNetworkSession::NORMAL_SOCKET_POOL,
|
| - HostPortPair("myproxy", 8888))));
|
| - EXPECT_EQ(0, GetSocketPoolGroupCount(session->GetSocketPoolForSSLWithProxy(
|
| - HttpNetworkSession::NORMAL_SOCKET_POOL,
|
| - HostPortPair("myproxy", 8888))));
|
| - EXPECT_EQ(0, GetSocketPoolGroupCount(session->GetSocketPoolForHTTPProxy(
|
| - HttpNetworkSession::WEBSOCKET_SOCKET_POOL,
|
| - HostPortPair("myproxy", 8888))));
|
| - EXPECT_EQ(0, GetSocketPoolGroupCount(session->GetSocketPoolForSSLWithProxy(
|
| - HttpNetworkSession::WEBSOCKET_SOCKET_POOL,
|
| - HostPortPair("myproxy", 8888))));
|
| + EXPECT_EQ(0,
|
| + GetSocketPoolGroupCount(session->GetTransportSocketPool(
|
| + HttpNetworkSession::NORMAL_SOCKET_POOL)));
|
| + EXPECT_EQ(0,
|
| + GetSocketPoolGroupCount(session->GetSSLSocketPool(
|
| + HttpNetworkSession::NORMAL_SOCKET_POOL)));
|
| + EXPECT_EQ(1,
|
| + GetSocketPoolGroupCount(session->GetSocketPoolForHTTPProxy(
|
| + HttpNetworkSession::NORMAL_SOCKET_POOL,
|
| + HostPortPair("myproxy", 8888))));
|
| + EXPECT_EQ(0,
|
| + GetSocketPoolGroupCount(session->GetSocketPoolForSSLWithProxy(
|
| + HttpNetworkSession::NORMAL_SOCKET_POOL,
|
| + HostPortPair("myproxy", 8888))));
|
| + EXPECT_EQ(0,
|
| + GetSocketPoolGroupCount(session->GetSocketPoolForHTTPProxy(
|
| + HttpNetworkSession::WEBSOCKET_SOCKET_POOL,
|
| + HostPortPair("myproxy", 8888))));
|
| + EXPECT_EQ(0,
|
| + GetSocketPoolGroupCount(session->GetSocketPoolForSSLWithProxy(
|
| + HttpNetworkSession::WEBSOCKET_SOCKET_POOL,
|
| + HostPortPair("myproxy", 8888))));
|
| EXPECT_FALSE(waiter.used_proxy_info().is_direct());
|
| }
|
|
|
| TEST_P(HttpStreamFactoryTest, RequestWebSocketBasicHandshakeStream) {
|
| - SpdySessionDependencies session_deps(
|
| - GetParam(), ProxyService::CreateDirect());
|
| + SpdySessionDependencies session_deps(GetParam(),
|
| + ProxyService::CreateDirect());
|
|
|
| StaticSocketDataProvider socket_data;
|
| socket_data.set_connect_data(MockConnect(ASYNC, OK));
|
| @@ -958,21 +961,24 @@ TEST_P(HttpStreamFactoryTest, RequestWebSocketBasicHandshakeStream) {
|
| ASSERT_TRUE(NULL != waiter.websocket_stream());
|
| EXPECT_EQ(MockWebSocketHandshakeStream::kStreamTypeBasic,
|
| waiter.websocket_stream()->type());
|
| - EXPECT_EQ(0, GetSocketPoolGroupCount(
|
| - session->GetTransportSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL)));
|
| - EXPECT_EQ(0, GetSocketPoolGroupCount(
|
| - session->GetSSLSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL)));
|
| - EXPECT_EQ(1, GetSocketPoolGroupCount(
|
| - session->GetTransportSocketPool(
|
| - HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
|
| - EXPECT_EQ(0, GetSocketPoolGroupCount(
|
| - session->GetSSLSocketPool(HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
|
| + EXPECT_EQ(0,
|
| + GetSocketPoolGroupCount(session->GetTransportSocketPool(
|
| + HttpNetworkSession::NORMAL_SOCKET_POOL)));
|
| + EXPECT_EQ(0,
|
| + GetSocketPoolGroupCount(session->GetSSLSocketPool(
|
| + HttpNetworkSession::NORMAL_SOCKET_POOL)));
|
| + EXPECT_EQ(1,
|
| + GetSocketPoolGroupCount(session->GetTransportSocketPool(
|
| + HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
|
| + EXPECT_EQ(0,
|
| + GetSocketPoolGroupCount(session->GetSSLSocketPool(
|
| + HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
|
| EXPECT_TRUE(waiter.used_proxy_info().is_direct());
|
| }
|
|
|
| TEST_P(HttpStreamFactoryTest, RequestWebSocketBasicHandshakeStreamOverSSL) {
|
| - SpdySessionDependencies session_deps(
|
| - GetParam(), ProxyService::CreateDirect());
|
| + SpdySessionDependencies session_deps(GetParam(),
|
| + ProxyService::CreateDirect());
|
|
|
| MockRead mock_read(ASYNC, OK);
|
| StaticSocketDataProvider socket_data(&mock_read, 1, NULL, 0);
|
| @@ -1009,15 +1015,18 @@ TEST_P(HttpStreamFactoryTest, RequestWebSocketBasicHandshakeStreamOverSSL) {
|
| ASSERT_TRUE(NULL != waiter.websocket_stream());
|
| EXPECT_EQ(MockWebSocketHandshakeStream::kStreamTypeBasic,
|
| waiter.websocket_stream()->type());
|
| - EXPECT_EQ(0, GetSocketPoolGroupCount(
|
| - session->GetTransportSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL)));
|
| - EXPECT_EQ(0, GetSocketPoolGroupCount(
|
| - session->GetSSLSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL)));
|
| - EXPECT_EQ(1, GetSocketPoolGroupCount(
|
| - session->GetTransportSocketPool(
|
| - HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
|
| - EXPECT_EQ(1, GetSocketPoolGroupCount(
|
| - session->GetSSLSocketPool(HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
|
| + EXPECT_EQ(0,
|
| + GetSocketPoolGroupCount(session->GetTransportSocketPool(
|
| + HttpNetworkSession::NORMAL_SOCKET_POOL)));
|
| + EXPECT_EQ(0,
|
| + GetSocketPoolGroupCount(session->GetSSLSocketPool(
|
| + HttpNetworkSession::NORMAL_SOCKET_POOL)));
|
| + EXPECT_EQ(1,
|
| + GetSocketPoolGroupCount(session->GetTransportSocketPool(
|
| + HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
|
| + EXPECT_EQ(1,
|
| + GetSocketPoolGroupCount(session->GetSSLSocketPool(
|
| + HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
|
| EXPECT_TRUE(waiter.used_proxy_info().is_direct());
|
| }
|
|
|
| @@ -1057,23 +1066,28 @@ TEST_P(HttpStreamFactoryTest, RequestWebSocketBasicHandshakeStreamOverProxy) {
|
| ASSERT_TRUE(NULL != waiter.websocket_stream());
|
| EXPECT_EQ(MockWebSocketHandshakeStream::kStreamTypeBasic,
|
| waiter.websocket_stream()->type());
|
| - EXPECT_EQ(0, GetSocketPoolGroupCount(
|
| - session->GetTransportSocketPool(
|
| - HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
|
| - EXPECT_EQ(0, GetSocketPoolGroupCount(
|
| - session->GetSSLSocketPool(HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
|
| - EXPECT_EQ(0, GetSocketPoolGroupCount(session->GetSocketPoolForHTTPProxy(
|
| - HttpNetworkSession::NORMAL_SOCKET_POOL,
|
| - HostPortPair("myproxy", 8888))));
|
| - EXPECT_EQ(0, GetSocketPoolGroupCount(session->GetSocketPoolForSSLWithProxy(
|
| - HttpNetworkSession::NORMAL_SOCKET_POOL,
|
| - HostPortPair("myproxy", 8888))));
|
| - EXPECT_EQ(1, GetSocketPoolGroupCount(session->GetSocketPoolForHTTPProxy(
|
| - HttpNetworkSession::WEBSOCKET_SOCKET_POOL,
|
| - HostPortPair("myproxy", 8888))));
|
| - EXPECT_EQ(0, GetSocketPoolGroupCount(session->GetSocketPoolForSSLWithProxy(
|
| - HttpNetworkSession::WEBSOCKET_SOCKET_POOL,
|
| - HostPortPair("myproxy", 8888))));
|
| + EXPECT_EQ(0,
|
| + GetSocketPoolGroupCount(session->GetTransportSocketPool(
|
| + HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
|
| + EXPECT_EQ(0,
|
| + GetSocketPoolGroupCount(session->GetSSLSocketPool(
|
| + HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
|
| + EXPECT_EQ(0,
|
| + GetSocketPoolGroupCount(session->GetSocketPoolForHTTPProxy(
|
| + HttpNetworkSession::NORMAL_SOCKET_POOL,
|
| + HostPortPair("myproxy", 8888))));
|
| + EXPECT_EQ(0,
|
| + GetSocketPoolGroupCount(session->GetSocketPoolForSSLWithProxy(
|
| + HttpNetworkSession::NORMAL_SOCKET_POOL,
|
| + HostPortPair("myproxy", 8888))));
|
| + EXPECT_EQ(1,
|
| + GetSocketPoolGroupCount(session->GetSocketPoolForHTTPProxy(
|
| + HttpNetworkSession::WEBSOCKET_SOCKET_POOL,
|
| + HostPortPair("myproxy", 8888))));
|
| + EXPECT_EQ(0,
|
| + GetSocketPoolGroupCount(session->GetSocketPoolForSSLWithProxy(
|
| + HttpNetworkSession::WEBSOCKET_SOCKET_POOL,
|
| + HostPortPair("myproxy", 8888))));
|
| EXPECT_FALSE(waiter.used_proxy_info().is_direct());
|
| }
|
|
|
| @@ -1093,9 +1107,8 @@ TEST_P(HttpStreamFactoryTest, RequestSpdyHttpStream) {
|
| &ssl_socket_data);
|
|
|
| HostPortPair host_port_pair("www.google.com", 443);
|
| - scoped_refptr<HttpNetworkSession>
|
| - session(SpdySessionDependencies::SpdyCreateSessionDeterministic(
|
| - &session_deps));
|
| + scoped_refptr<HttpNetworkSession> session(
|
| + SpdySessionDependencies::SpdyCreateSessionDeterministic(&session_deps));
|
|
|
| // Now request a stream.
|
| HttpRequestInfo request_info;
|
| @@ -1106,27 +1119,29 @@ TEST_P(HttpStreamFactoryTest, RequestSpdyHttpStream) {
|
| SSLConfig ssl_config;
|
| StreamRequestWaiter waiter;
|
| scoped_ptr<HttpStreamRequest> request(
|
| - session->http_stream_factory()->RequestStream(
|
| - request_info,
|
| - DEFAULT_PRIORITY,
|
| - ssl_config,
|
| - ssl_config,
|
| - &waiter,
|
| - BoundNetLog()));
|
| + session->http_stream_factory()->RequestStream(request_info,
|
| + DEFAULT_PRIORITY,
|
| + ssl_config,
|
| + ssl_config,
|
| + &waiter,
|
| + BoundNetLog()));
|
| waiter.WaitForStream();
|
| EXPECT_TRUE(waiter.stream_done());
|
| EXPECT_TRUE(NULL == waiter.websocket_stream());
|
| ASSERT_TRUE(NULL != waiter.stream());
|
| EXPECT_TRUE(waiter.stream()->IsSpdyHttpStream());
|
| - EXPECT_EQ(1, GetSocketPoolGroupCount(
|
| - session->GetTransportSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL)));
|
| - EXPECT_EQ(1, GetSocketPoolGroupCount(
|
| - session->GetSSLSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL)));
|
| - EXPECT_EQ(0, GetSocketPoolGroupCount(
|
| - session->GetTransportSocketPool(
|
| - HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
|
| - EXPECT_EQ(0, GetSocketPoolGroupCount(
|
| - session->GetSSLSocketPool(HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
|
| + EXPECT_EQ(1,
|
| + GetSocketPoolGroupCount(session->GetTransportSocketPool(
|
| + HttpNetworkSession::NORMAL_SOCKET_POOL)));
|
| + EXPECT_EQ(1,
|
| + GetSocketPoolGroupCount(session->GetSSLSocketPool(
|
| + HttpNetworkSession::NORMAL_SOCKET_POOL)));
|
| + EXPECT_EQ(0,
|
| + GetSocketPoolGroupCount(session->GetTransportSocketPool(
|
| + HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
|
| + EXPECT_EQ(0,
|
| + GetSocketPoolGroupCount(session->GetSSLSocketPool(
|
| + HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
|
| EXPECT_TRUE(waiter.used_proxy_info().is_direct());
|
| }
|
|
|
| @@ -1146,8 +1161,8 @@ TEST_P(HttpStreamFactoryTest, RequestWebSocketSpdyHandshakeStreamButGetSSL) {
|
| session_deps.socket_factory->AddSSLSocketDataProvider(&ssl_socket_data);
|
|
|
| HostPortPair host_port_pair("www.google.com", 80);
|
| - scoped_refptr<HttpNetworkSession>
|
| - session(SpdySessionDependencies::SpdyCreateSession(&session_deps));
|
| + scoped_refptr<HttpNetworkSession> session(
|
| + SpdySessionDependencies::SpdyCreateSession(&session_deps));
|
|
|
| // Now request a stream.
|
| HttpRequestInfo request_info;
|
| @@ -1174,15 +1189,18 @@ TEST_P(HttpStreamFactoryTest, RequestWebSocketSpdyHandshakeStreamButGetSSL) {
|
| waiter1.websocket_stream()->type());
|
| EXPECT_TRUE(NULL == waiter1.stream());
|
|
|
| - EXPECT_EQ(0, GetSocketPoolGroupCount(
|
| - session->GetTransportSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL)));
|
| - EXPECT_EQ(0, GetSocketPoolGroupCount(
|
| - session->GetSSLSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL)));
|
| - EXPECT_EQ(1, GetSocketPoolGroupCount(
|
| - session->GetTransportSocketPool(
|
| + EXPECT_EQ(0,
|
| + GetSocketPoolGroupCount(session->GetTransportSocketPool(
|
| + HttpNetworkSession::NORMAL_SOCKET_POOL)));
|
| + EXPECT_EQ(0,
|
| + GetSocketPoolGroupCount(session->GetSSLSocketPool(
|
| + HttpNetworkSession::NORMAL_SOCKET_POOL)));
|
| + EXPECT_EQ(1,
|
| + GetSocketPoolGroupCount(session->GetTransportSocketPool(
|
| + HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
|
| + EXPECT_EQ(1,
|
| + GetSocketPoolGroupCount(session->GetSSLSocketPool(
|
| HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
|
| - EXPECT_EQ(1, GetSocketPoolGroupCount(
|
| - session->GetSSLSocketPool(HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
|
| EXPECT_TRUE(waiter1.used_proxy_info().is_direct());
|
| }
|
|
|
| @@ -1201,8 +1219,8 @@ TEST_P(HttpStreamFactoryTest, DISABLED_RequestWebSocketSpdyHandshakeStream) {
|
| session_deps.socket_factory->AddSSLSocketDataProvider(&ssl_socket_data);
|
|
|
| HostPortPair host_port_pair("www.google.com", 80);
|
| - scoped_refptr<HttpNetworkSession>
|
| - session(SpdySessionDependencies::SpdyCreateSession(&session_deps));
|
| + scoped_refptr<HttpNetworkSession> session(
|
| + SpdySessionDependencies::SpdyCreateSession(&session_deps));
|
|
|
| // Now request a stream.
|
| HttpRequestInfo request_info;
|
| @@ -1251,15 +1269,18 @@ TEST_P(HttpStreamFactoryTest, DISABLED_RequestWebSocketSpdyHandshakeStream) {
|
| static_cast<WebSocketSpdyHandshakeStream*>(
|
| waiter1.websocket_stream())->spdy_session());
|
|
|
| - EXPECT_EQ(0, GetSocketPoolGroupCount(
|
| - session->GetTransportSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL)));
|
| - EXPECT_EQ(0, GetSocketPoolGroupCount(
|
| - session->GetSSLSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL)));
|
| - EXPECT_EQ(1, GetSocketPoolGroupCount(
|
| - session->GetTransportSocketPool(
|
| - HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
|
| - EXPECT_EQ(1, GetSocketPoolGroupCount(
|
| - session->GetSSLSocketPool(HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
|
| + EXPECT_EQ(0,
|
| + GetSocketPoolGroupCount(session->GetTransportSocketPool(
|
| + HttpNetworkSession::NORMAL_SOCKET_POOL)));
|
| + EXPECT_EQ(0,
|
| + GetSocketPoolGroupCount(session->GetSSLSocketPool(
|
| + HttpNetworkSession::NORMAL_SOCKET_POOL)));
|
| + EXPECT_EQ(1,
|
| + GetSocketPoolGroupCount(session->GetTransportSocketPool(
|
| + HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
|
| + EXPECT_EQ(1,
|
| + GetSocketPoolGroupCount(session->GetSSLSocketPool(
|
| + HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
|
| EXPECT_TRUE(waiter1.used_proxy_info().is_direct());
|
| }
|
|
|
| @@ -1286,9 +1307,8 @@ TEST_P(HttpStreamFactoryTest, DISABLED_OrphanedWebSocketStream) {
|
| session_deps.deterministic_socket_factory->AddSSLSocketDataProvider(
|
| &ssl_socket_data);
|
|
|
| - scoped_refptr<HttpNetworkSession>
|
| - session(SpdySessionDependencies::SpdyCreateSessionDeterministic(
|
| - &session_deps));
|
| + scoped_refptr<HttpNetworkSession> session(
|
| + SpdySessionDependencies::SpdyCreateSessionDeterministic(&session_deps));
|
|
|
| // Now request a stream.
|
| HttpRequestInfo request_info;
|
| @@ -1297,9 +1317,7 @@ TEST_P(HttpStreamFactoryTest, DISABLED_OrphanedWebSocketStream) {
|
| request_info.load_flags = 0;
|
|
|
| session->http_server_properties()->SetAlternateProtocol(
|
| - HostPortPair("www.google.com", 8888),
|
| - 9999,
|
| - NPN_SPDY_3);
|
| + HostPortPair("www.google.com", 8888), 9999, NPN_SPDY_3);
|
|
|
| SSLConfig ssl_config;
|
| StreamRequestWaiter waiter;
|
| @@ -1322,20 +1340,25 @@ TEST_P(HttpStreamFactoryTest, DISABLED_OrphanedWebSocketStream) {
|
|
|
| // Make sure that there was an alternative connection
|
| // which consumes extra connections.
|
| - EXPECT_EQ(0, GetSocketPoolGroupCount(
|
| - session->GetTransportSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL)));
|
| - EXPECT_EQ(0, GetSocketPoolGroupCount(
|
| - session->GetSSLSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL)));
|
| - EXPECT_EQ(2, GetSocketPoolGroupCount(
|
| - session->GetTransportSocketPool(
|
| - HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
|
| - EXPECT_EQ(1, GetSocketPoolGroupCount(
|
| - session->GetSSLSocketPool(HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
|
| + EXPECT_EQ(0,
|
| + GetSocketPoolGroupCount(session->GetTransportSocketPool(
|
| + HttpNetworkSession::NORMAL_SOCKET_POOL)));
|
| + EXPECT_EQ(0,
|
| + GetSocketPoolGroupCount(session->GetSSLSocketPool(
|
| + HttpNetworkSession::NORMAL_SOCKET_POOL)));
|
| + EXPECT_EQ(2,
|
| + GetSocketPoolGroupCount(session->GetTransportSocketPool(
|
| + HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
|
| + EXPECT_EQ(1,
|
| + GetSocketPoolGroupCount(session->GetSSLSocketPool(
|
| + HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
|
| EXPECT_TRUE(waiter.used_proxy_info().is_direct());
|
|
|
| // Make sure there is no orphaned job. it is already canceled.
|
| - ASSERT_EQ(0u, static_cast<HttpStreamFactoryImpl*>(
|
| - session->http_stream_factory_for_websocket())->num_orphaned_jobs());
|
| + ASSERT_EQ(
|
| + 0u,
|
| + static_cast<HttpStreamFactoryImpl*>(
|
| + session->http_stream_factory_for_websocket())->num_orphaned_jobs());
|
| }
|
|
|
| } // namespace
|
|
|
Chromium Code Reviews
