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

Unified Diff: net/spdy/spdy_proxy_client_socket_unittest.cc

Issue 1779733003: Fix bug in net::RequestPriority -> HTTP/2 dependency conversion. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: net/spdy/spdy_proxy_client_socket_unittest.cc
diff --git a/net/spdy/spdy_proxy_client_socket_unittest.cc b/net/spdy/spdy_proxy_client_socket_unittest.cc
index 20ba5a5d8eea6f9d67ca95a2cb44a85b67cb5379..d8cb4dc0d68c23c1c834ad9915b2695b13b6bbc1 100644
--- a/net/spdy/spdy_proxy_client_socket_unittest.cc
+++ b/net/spdy/spdy_proxy_client_socket_unittest.cc
@@ -154,6 +154,7 @@ class SpdyProxyClientSocketTest : public PlatformTest,
HostPortPair endpoint_host_port_pair_;
ProxyServer proxy_;
SpdySessionKey endpoint_spdy_session_key_;
+ bool old_dependency_default_;
DISALLOW_COPY_AND_ASSIGN(SpdyProxyClientSocketTest);
};
@@ -179,14 +180,16 @@ SpdyProxyClientSocketTest::SpdyProxyClientSocketTest()
proxy_,
PRIVACY_MODE_DISABLED) {
session_deps_.net_log = net_log_.bound().net_log();
- SpdySession::SetPriorityDependencyDefaultForTesting(
- GetDependenciesFromPriority());
+ old_dependency_default_ =
+ Http2PriorityDependencies::SetEnabledDefaultForTesting(
+ GetDependenciesFromPriority());
}
SpdyProxyClientSocketTest::~SpdyProxyClientSocketTest() {
EXPECT_TRUE(data_->AllWriteDataConsumed());
EXPECT_TRUE(data_->AllReadDataConsumed());
- SpdySession::SetPriorityDependencyDefaultForTesting(false);
+ Http2PriorityDependencies::SetEnabledDefaultForTesting(
+ old_dependency_default_);
}
void SpdyProxyClientSocketTest::TearDown() {

Powered by Google App Engine
This is Rietveld 408576698