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

Unified Diff: net/spdy/spdy_session_pool_unittest.cc

Issue 1411383005: Initial implementation of RequestPriority-based HTTP/2 dependencies. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Tweaked comments and destruction notification vs. extra test util class. Created 5 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: net/spdy/spdy_session_pool_unittest.cc
diff --git a/net/spdy/spdy_session_pool_unittest.cc b/net/spdy/spdy_session_pool_unittest.cc
index 86b3b4a9a21ba4728dad23dca161cda14b2d9229..9308e7135fb26ea0e8268352f9fdbd3d01e3cbed 100644
--- a/net/spdy/spdy_session_pool_unittest.cc
+++ b/net/spdy/spdy_session_pool_unittest.cc
@@ -20,8 +20,6 @@
namespace net {
-namespace {
-
class SpdySessionPoolTest : public ::testing::Test,
public ::testing::WithParamInterface<NextProto> {
protected:
@@ -510,7 +508,13 @@ TEST_P(SpdySessionPoolTest, IPPoolingCloseIdleSessions) {
TEST_P(SpdySessionPoolTest, IPAddressChanged) {
MockConnect connect_data(SYNCHRONOUS, OK);
session_deps_.host_resolver->set_synchronous_mode(true);
- SpdyTestUtil spdy_util(GetParam());
+
+ // This isn't testing anything having to do with Spdy frames; we
Bence 2015/11/12 01:33:29 s/Spdy/SPDY/
Randy Smith (Not in Mondays) 2015/11/12 01:59:32 Done.
+ // can ignore issues of how dependencies are set. We default to
+ // setting them (when doing the appropriate protocol) since that's
+ // where we're eventually headed for all HTTP/2 connections.
+ SpdyTestUtil spdy_util(GetParam(), true);
+ SpdySession::SetPriorityDependencyDefaultForTesting(true);
MockRead reads[] = {
MockRead(SYNCHRONOUS, ERR_IO_PENDING) // Stall forever.
@@ -613,8 +617,7 @@ TEST_P(SpdySessionPoolTest, IPAddressChanged) {
EXPECT_TRUE(delegateB.StreamIsClosed());
EXPECT_EQ(ERR_NETWORK_CHANGED, delegateB.WaitForClose());
#endif // defined(OS_ANDROID) || defined(OS_WIN) || defined(OS_IOS)
+ SpdySession::SetPriorityDependencyDefaultForTesting(false);
}
-} // namespace
-
} // namespace net

Powered by Google App Engine
This is Rietveld 408576698