diff options
| author | bnc <bnc@chromium.org> | 2015-06-18 05:24:49 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-18 12:26:15 +0000 |
| commit | acac4f8a457b77e253a13af08605aac8a899cab4 (patch) | |
| tree | e6795077fe3cce2cb5dbd0d38e1d83f5171f398c /net/tools/flip_server | |
| parent | 55a307ec846f48b23efcf58ec889274d5a289fae (diff) | |
| download | chromium_src-acac4f8a457b77e253a13af08605aac8a899cab4.zip chromium_src-acac4f8a457b77e253a13af08605aac8a899cab4.tar.gz chromium_src-acac4f8a457b77e253a13af08605aac8a899cab4.tar.bz2 | |
SPDY enum cleanup.
Remove the SPDY4 value from the SpdyMajorVersion enum.
This CL lands server change 93749977 by birenroy.
BUG=419722
Review URL: https://codereview.chromium.org/1178723008
Cr-Commit-Position: refs/heads/master@{#335016}
Diffstat (limited to 'net/tools/flip_server')
| -rw-r--r-- | net/tools/flip_server/sm_connection.cc | 2 | ||||
| -rw-r--r-- | net/tools/flip_server/spdy_interface_test.cc | 16 |
2 files changed, 8 insertions, 10 deletions
diff --git a/net/tools/flip_server/sm_connection.cc b/net/tools/flip_server/sm_connection.cc index 4acdea4..c132b8c 100644 --- a/net/tools/flip_server/sm_connection.cc +++ b/net/tools/flip_server/sm_connection.cc @@ -332,7 +332,7 @@ bool SMConnection::WasSpdyNegotiated(SpdyMajorVersion* version_negotiated) { if (!strncmp(reinterpret_cast<const char*>(npn_proto), "spdy/4a2", npn_proto_len)) { - *version_negotiated = SPDY4; + *version_negotiated = HTTP2; return true; } } diff --git a/net/tools/flip_server/spdy_interface_test.cc b/net/tools/flip_server/spdy_interface_test.cc index 6aa3d30..5f89a2b 100644 --- a/net/tools/flip_server/spdy_interface_test.cc +++ b/net/tools/flip_server/spdy_interface_test.cc @@ -205,10 +205,8 @@ class SpdySMServerTest : public SpdySMTestBase { virtual ~SpdySMServerTest() {} }; -INSTANTIATE_TEST_CASE_P(SpdySMProxyTest, - SpdySMProxyTest, - Values(SPDY3, SPDY4)); -INSTANTIATE_TEST_CASE_P(SpdySMServerTest, SpdySMServerTest, Values(SPDY4)); +INSTANTIATE_TEST_CASE_P(SpdySMProxyTest, SpdySMProxyTest, Values(SPDY3, HTTP2)); +INSTANTIATE_TEST_CASE_P(SpdySMServerTest, SpdySMServerTest, Values(HTTP2)); TEST_P(SpdySMProxyTest, InitSMConnection) { { @@ -307,9 +305,9 @@ TEST_P(SpdySMProxyTest, CreateFramer) { ASSERT_EQ(interface_->spdy_version(), SPDY3); interface_->ResetForNewConnection(); - interface_->CreateFramer(SPDY4); + interface_->CreateFramer(HTTP2); ASSERT_TRUE(interface_->spdy_framer() != NULL); - ASSERT_EQ(interface_->spdy_version(), SPDY4); + ASSERT_EQ(interface_->spdy_version(), HTTP2); } TEST_P(SpdySMProxyTest, PostAcceptHook) { @@ -363,7 +361,7 @@ TEST_P(SpdySMProxyTest, SendErrorNotFound) { { InSequence s; - if (GetParam() < SPDY4) { + if (GetParam() < HTTP2) { EXPECT_CALL(*spdy_framer_visitor_, OnSynReply(stream_id, false, _)) .WillOnce(SaveArg<2>(&actual_header_block)); @@ -443,7 +441,7 @@ TEST_P(SpdySMProxyTest, SendSynReply) { { InSequence s; - if (GetParam() < SPDY4) { + if (GetParam() < HTTP2) { EXPECT_CALL(*spdy_framer_visitor_, OnSynReply(stream_id, false, _)) .WillOnce(SaveArg<2>(&actual_header_block)); } else { @@ -569,7 +567,7 @@ TEST_P(SpdySMServerTest, NewStreamError) { { InSequence s; - if (GetParam() < SPDY4) { + if (GetParam() < HTTP2) { EXPECT_CALL(*spdy_framer_visitor_, OnSynReply(stream_id, false, _)) .WillOnce(SaveArg<2>(&actual_header_block)); } else { |