diff options
| author | rch <rch@chromium.org> | 2015-01-30 15:57:32 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-30 23:58:38 +0000 |
| commit | 9c3e338015e3bbb1bfc1e892b076eb7411aee43f (patch) | |
| tree | 477d8118176549b255264ffcb1b9280d3ce2d847 /net/http/http_server_properties_manager_unittest.cc | |
| parent | 61944aec76677366442bacbf6b60cccf1508bca3 (diff) | |
| download | chromium_src-9c3e338015e3bbb1bfc1e892b076eb7411aee43f.zip chromium_src-9c3e338015e3bbb1bfc1e892b076eb7411aee43f.tar.gz chromium_src-9c3e338015e3bbb1bfc1e892b076eb7411aee43f.tar.bz2 | |
Fix bug where requests to QUIC servers were throttled by the resource scheduler.
Review URL: https://codereview.chromium.org/893693002
Cr-Commit-Position: refs/heads/master@{#314032}
Diffstat (limited to 'net/http/http_server_properties_manager_unittest.cc')
| -rw-r--r-- | net/http/http_server_properties_manager_unittest.cc | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/net/http/http_server_properties_manager_unittest.cc b/net/http/http_server_properties_manager_unittest.cc index 66e588c..d021fc5 100644 --- a/net/http/http_server_properties_manager_unittest.cc +++ b/net/http/http_server_properties_manager_unittest.cc @@ -223,9 +223,10 @@ TEST_F(HttpServerPropertiesManagerTest, Mock::VerifyAndClearExpectations(http_server_props_manager_.get()); // Verify SupportsSpdy. - EXPECT_TRUE(http_server_props_manager_->SupportsSpdy(google_server)); - EXPECT_TRUE(http_server_props_manager_->SupportsSpdy(mail_server)); - EXPECT_FALSE(http_server_props_manager_->SupportsSpdy( + EXPECT_TRUE( + http_server_props_manager_->SupportsRequestPriority(google_server)); + EXPECT_TRUE(http_server_props_manager_->SupportsRequestPriority(mail_server)); + EXPECT_FALSE(http_server_props_manager_->SupportsRequestPriority( HostPortPair::FromString("foo.google.com:1337"))); // Verify AlternateProtocol. @@ -304,7 +305,7 @@ TEST_F(HttpServerPropertiesManagerTest, BadCachedHostPortPair) { Mock::VerifyAndClearExpectations(http_server_props_manager_.get()); // Verify that nothing is set. - EXPECT_FALSE(http_server_props_manager_->SupportsSpdy( + EXPECT_FALSE(http_server_props_manager_->SupportsRequestPriority( HostPortPair::FromString("www.google.com:65536"))); EXPECT_FALSE(http_server_props_manager_->HasAlternateProtocol( HostPortPair::FromString("www.google.com:65536"))); @@ -363,13 +364,15 @@ TEST_F(HttpServerPropertiesManagerTest, SupportsSpdy) { // Add mail.google.com:443 as a supporting spdy server. HostPortPair spdy_server_mail("mail.google.com", 443); - EXPECT_FALSE(http_server_props_manager_->SupportsSpdy(spdy_server_mail)); + EXPECT_FALSE( + http_server_props_manager_->SupportsRequestPriority(spdy_server_mail)); http_server_props_manager_->SetSupportsSpdy(spdy_server_mail, true); // Run the task. base::RunLoop().RunUntilIdle(); - EXPECT_TRUE(http_server_props_manager_->SupportsSpdy(spdy_server_mail)); + EXPECT_TRUE( + http_server_props_manager_->SupportsRequestPriority(spdy_server_mail)); Mock::VerifyAndClearExpectations(http_server_props_manager_.get()); } @@ -556,7 +559,8 @@ TEST_F(HttpServerPropertiesManagerTest, Clear) { // Run the task. base::RunLoop().RunUntilIdle(); - EXPECT_TRUE(http_server_props_manager_->SupportsSpdy(spdy_server_mail)); + EXPECT_TRUE( + http_server_props_manager_->SupportsRequestPriority(spdy_server_mail)); EXPECT_TRUE( http_server_props_manager_->HasAlternateProtocol(spdy_server_mail)); SupportsQuic supports_quic = @@ -585,7 +589,8 @@ TEST_F(HttpServerPropertiesManagerTest, Clear) { http_server_props_manager_->Clear(base::MessageLoop::QuitClosure()); base::RunLoop().Run(); - EXPECT_FALSE(http_server_props_manager_->SupportsSpdy(spdy_server_mail)); + EXPECT_FALSE( + http_server_props_manager_->SupportsRequestPriority(spdy_server_mail)); EXPECT_FALSE( http_server_props_manager_->HasAlternateProtocol(spdy_server_mail)); SupportsQuic supports_quic1 = |