diff options
| author | bnc <bnc@chromium.org> | 2015-07-20 04:25:46 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-20 11:26:20 +0000 |
| commit | cd0680e4995f35c56878bb91ccc2ae9f565b9ef9 (patch) | |
| tree | 2d23386dc5d36bf9f3e45dbdac85dc1c2e84eded /net/http/http_server_properties_manager_unittest.cc | |
| parent | 5a025bd652274fe5f2f5c93b583717eff92da965 (diff) | |
| download | chromium_src-cd0680e4995f35c56878bb91ccc2ae9f565b9ef9.zip chromium_src-cd0680e4995f35c56878bb91ccc2ae9f565b9ef9.tar.gz chromium_src-cd0680e4995f35c56878bb91ccc2ae9f565b9ef9.tar.bz2 | |
Stop using SPDY/3 in tests.
SPDY/3 is deprecated and will gradually be removed from the codebase. This CL
removes all remaining occurrences of "npn-spdy/3" protocol string and NPN_SPDY_3
enum AlternateProtocol value from unittests.
BUG=431299
Review URL: https://codereview.chromium.org/1225263003
Cr-Commit-Position: refs/heads/master@{#339431}
Diffstat (limited to 'net/http/http_server_properties_manager_unittest.cc')
| -rw-r--r-- | net/http/http_server_properties_manager_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/http/http_server_properties_manager_unittest.cc b/net/http/http_server_properties_manager_unittest.cc index 2a5d049..dbaedac 100644 --- a/net/http/http_server_properties_manager_unittest.cc +++ b/net/http/http_server_properties_manager_unittest.cc @@ -192,7 +192,7 @@ TEST_F(HttpServerPropertiesManagerTest, // Set up alternative_services for www.google.com:80. base::DictionaryValue* alternative_service_dict0 = new base::DictionaryValue; alternative_service_dict0->SetInteger("port", 443); - alternative_service_dict0->SetString("protocol_str", "npn-spdy/3"); + alternative_service_dict0->SetString("protocol_str", "npn-h2"); base::DictionaryValue* alternative_service_dict1 = new base::DictionaryValue; alternative_service_dict1->SetInteger("port", 1234); alternative_service_dict1->SetString("protocol_str", "quic"); @@ -268,7 +268,7 @@ TEST_F(HttpServerPropertiesManagerTest, AlternativeServiceMap::const_iterator map_it = map.begin(); EXPECT_EQ("www.google.com", map_it->first.host()); ASSERT_EQ(2u, map_it->second.size()); - EXPECT_EQ(NPN_SPDY_3, map_it->second[0].alternative_service.protocol); + EXPECT_EQ(NPN_HTTP_2, map_it->second[0].alternative_service.protocol); EXPECT_TRUE(map_it->second[0].alternative_service.host.empty()); EXPECT_EQ(443, map_it->second[0].alternative_service.port); EXPECT_EQ(QUIC, map_it->second[1].alternative_service.protocol); @@ -308,7 +308,7 @@ TEST_F(HttpServerPropertiesManagerTest, BadCachedHostPortPair) { // Set up alternative_service for www.google.com:65536. base::DictionaryValue* alternative_service_dict = new base::DictionaryValue; - alternative_service_dict->SetString("protocol_str", "npn-spdy/3"); + alternative_service_dict->SetString("protocol_str", "npn-h2"); alternative_service_dict->SetInteger("port", 80); base::ListValue* alternative_service_list = new base::ListValue; alternative_service_list->Append(alternative_service_dict); @@ -361,7 +361,7 @@ TEST_F(HttpServerPropertiesManagerTest, BadCachedAltProtocolPort) { // Set up alternative_service for www.google.com:80. base::DictionaryValue* alternative_service_dict = new base::DictionaryValue; - alternative_service_dict->SetString("protocol_str", "npn-spdy/3"); + alternative_service_dict->SetString("protocol_str", "npn-h2"); alternative_service_dict->SetInteger("port", 65536); base::ListValue* alternative_service_list = new base::ListValue; alternative_service_list->Append(alternative_service_dict); |