Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(282)

Side by Side Diff: net/http/http_stream_factory_impl_unittest.cc

Issue 1941083002: JobController 1: Adding a new class HttpStreamFactoryImpl::JobController (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1451 matching lines...) Expand 10 before | Expand all | Expand 10 after
1462 ASSERT_TRUE(waiter.bidirectional_stream_impl()); 1462 ASSERT_TRUE(waiter.bidirectional_stream_impl());
1463 EXPECT_EQ(1, GetSocketPoolGroupCount(session->GetTransportSocketPool( 1463 EXPECT_EQ(1, GetSocketPoolGroupCount(session->GetTransportSocketPool(
1464 HttpNetworkSession::NORMAL_SOCKET_POOL))); 1464 HttpNetworkSession::NORMAL_SOCKET_POOL)));
1465 EXPECT_EQ(1, GetSocketPoolGroupCount(session->GetSSLSocketPool( 1465 EXPECT_EQ(1, GetSocketPoolGroupCount(session->GetSSLSocketPool(
1466 HttpNetworkSession::NORMAL_SOCKET_POOL))); 1466 HttpNetworkSession::NORMAL_SOCKET_POOL)));
1467 EXPECT_EQ(0, GetSocketPoolGroupCount(session->GetTransportSocketPool( 1467 EXPECT_EQ(0, GetSocketPoolGroupCount(session->GetTransportSocketPool(
1468 HttpNetworkSession::WEBSOCKET_SOCKET_POOL))); 1468 HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
1469 EXPECT_EQ(0, GetSocketPoolGroupCount(session->GetSSLSocketPool( 1469 EXPECT_EQ(0, GetSocketPoolGroupCount(session->GetSSLSocketPool(
1470 HttpNetworkSession::WEBSOCKET_SOCKET_POOL))); 1470 HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
1471 EXPECT_TRUE(waiter.used_proxy_info().is_direct()); 1471 EXPECT_TRUE(waiter.used_proxy_info().is_direct());
1472 ASSERT_EQ(0u,
1473 static_cast<HttpStreamFactoryImpl*>(session->http_stream_factory())
1474 ->num_orphaned_jobs());
1475 } 1472 }
1476 1473
1477 class HttpStreamFactoryBidirectionalQuicTest 1474 class HttpStreamFactoryBidirectionalQuicTest
1478 : public ::testing::Test, 1475 : public ::testing::Test,
1479 public ::testing::WithParamInterface<QuicVersion> { 1476 public ::testing::WithParamInterface<QuicVersion> {
1480 protected: 1477 protected:
1481 HttpStreamFactoryBidirectionalQuicTest() 1478 HttpStreamFactoryBidirectionalQuicTest()
1482 : clock_(new MockClock), 1479 : clock_(new MockClock),
1483 client_packet_maker_(GetParam(), 1480 client_packet_maker_(GetParam(),
1484 0, 1481 0,
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
1820 ASSERT_FALSE(waiter.stream()); 1817 ASSERT_FALSE(waiter.stream());
1821 ASSERT_FALSE(waiter.bidirectional_stream_impl()); 1818 ASSERT_FALSE(waiter.bidirectional_stream_impl());
1822 EXPECT_EQ(1, GetSocketPoolGroupCount(session->GetTransportSocketPool( 1819 EXPECT_EQ(1, GetSocketPoolGroupCount(session->GetTransportSocketPool(
1823 HttpNetworkSession::NORMAL_SOCKET_POOL))); 1820 HttpNetworkSession::NORMAL_SOCKET_POOL)));
1824 EXPECT_EQ(1, GetSocketPoolGroupCount(session->GetSSLSocketPool( 1821 EXPECT_EQ(1, GetSocketPoolGroupCount(session->GetSSLSocketPool(
1825 HttpNetworkSession::NORMAL_SOCKET_POOL))); 1822 HttpNetworkSession::NORMAL_SOCKET_POOL)));
1826 EXPECT_EQ(0, GetSocketPoolGroupCount(session->GetTransportSocketPool( 1823 EXPECT_EQ(0, GetSocketPoolGroupCount(session->GetTransportSocketPool(
1827 HttpNetworkSession::WEBSOCKET_SOCKET_POOL))); 1824 HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
1828 EXPECT_EQ(0, GetSocketPoolGroupCount(session->GetSSLSocketPool( 1825 EXPECT_EQ(0, GetSocketPoolGroupCount(session->GetSSLSocketPool(
1829 HttpNetworkSession::WEBSOCKET_SOCKET_POOL))); 1826 HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
1830 ASSERT_EQ(0u,
1831 static_cast<HttpStreamFactoryImpl*>(session->http_stream_factory())
1832 ->num_orphaned_jobs());
1833 } 1827 }
1834 1828
1835 // TODO(ricea): This test can be removed once the new WebSocket stack supports 1829 // TODO(ricea): This test can be removed once the new WebSocket stack supports
1836 // SPDY. Currently, even if we connect to a SPDY-supporting server, we need to 1830 // SPDY. Currently, even if we connect to a SPDY-supporting server, we need to
1837 // use plain SSL. 1831 // use plain SSL.
1838 TEST_P(HttpStreamFactoryTest, RequestWebSocketSpdyHandshakeStreamButGetSSL) { 1832 TEST_P(HttpStreamFactoryTest, RequestWebSocketSpdyHandshakeStreamButGetSSL) {
1839 SpdySessionDependencies session_deps(GetParam(), 1833 SpdySessionDependencies session_deps(GetParam(),
1840 ProxyService::CreateDirect()); 1834 ProxyService::CreateDirect());
1841 1835
1842 MockRead mock_read(SYNCHRONOUS, ERR_IO_PENDING); 1836 MockRead mock_read(SYNCHRONOUS, ERR_IO_PENDING);
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
2007 EXPECT_EQ(0, GetSocketPoolGroupCount( 2001 EXPECT_EQ(0, GetSocketPoolGroupCount(
2008 session->GetTransportSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL))); 2002 session->GetTransportSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL)));
2009 EXPECT_EQ(0, GetSocketPoolGroupCount( 2003 EXPECT_EQ(0, GetSocketPoolGroupCount(
2010 session->GetSSLSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL))); 2004 session->GetSSLSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL)));
2011 EXPECT_EQ(2, GetSocketPoolGroupCount( 2005 EXPECT_EQ(2, GetSocketPoolGroupCount(
2012 session->GetTransportSocketPool( 2006 session->GetTransportSocketPool(
2013 HttpNetworkSession::WEBSOCKET_SOCKET_POOL))); 2007 HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
2014 EXPECT_EQ(1, GetSocketPoolGroupCount( 2008 EXPECT_EQ(1, GetSocketPoolGroupCount(
2015 session->GetSSLSocketPool(HttpNetworkSession::WEBSOCKET_SOCKET_POOL))); 2009 session->GetSSLSocketPool(HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
2016 EXPECT_TRUE(waiter.used_proxy_info().is_direct()); 2010 EXPECT_TRUE(waiter.used_proxy_info().is_direct());
2017
2018 // Make sure there is no orphaned job. it is already canceled.
2019 ASSERT_EQ(0u, static_cast<HttpStreamFactoryImpl*>(
2020 session->http_stream_factory_for_websocket())->num_orphaned_jobs());
2021 } 2011 }
2022 2012
2023 } // namespace 2013 } // namespace
2024 2014
2025 } // namespace net 2015 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698