summaryrefslogtreecommitdiff
path: root/chromium/net/http/bidirectional_stream_unittest.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-03-08 10:28:10 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-03-20 13:40:30 +0000
commite733310db58160074f574c429d48f8308c0afe17 (patch)
treef8aef4b7e62a69928dbcf880620eece20f98c6df /chromium/net/http/bidirectional_stream_unittest.cc
parent2f583e4aec1ae3a86fa047829c96b310dc12ecdf (diff)
downloadqtwebengine-chromium-e733310db58160074f574c429d48f8308c0afe17.tar.gz
BASELINE: Update Chromium to 56.0.2924.122
Change-Id: I4e04de8f47e47e501c46ed934c76a431c6337ced Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/net/http/bidirectional_stream_unittest.cc')
-rw-r--r--chromium/net/http/bidirectional_stream_unittest.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/chromium/net/http/bidirectional_stream_unittest.cc b/chromium/net/http/bidirectional_stream_unittest.cc
index 01881e34434..e55508f41bc 100644
--- a/chromium/net/http/bidirectional_stream_unittest.cc
+++ b/chromium/net/http/bidirectional_stream_unittest.cc
@@ -1637,7 +1637,7 @@ TEST_F(BidirectionalStreamTest, TestHonorAlternativeServiceHeader) {
MockWrite writes[] = {CreateMockWrite(req, 0)};
- std::string alt_svc_header_value = AlternateProtocolToString(QUIC);
+ std::string alt_svc_header_value = NextProtoToString(kProtoQUIC);
alt_svc_header_value.append("=\"www.example.org:443\"");
const char* const kExtraResponseHeaders[] = {"alt-svc",
alt_svc_header_value.c_str()};
@@ -1685,8 +1685,7 @@ TEST_F(BidirectionalStreamTest, TestHonorAlternativeServiceHeader) {
http_session_->http_server_properties()->GetAlternativeServices(
url::SchemeHostPort(default_url_));
ASSERT_EQ(1u, alternative_service_vector.size());
- EXPECT_EQ(AlternateProtocolFromNextProto(kProtoQUIC1SPDY3),
- alternative_service_vector[0].protocol);
+ EXPECT_EQ(kProtoQUIC, alternative_service_vector[0].protocol);
EXPECT_EQ("www.example.org", alternative_service_vector[0].host);
EXPECT_EQ(443, alternative_service_vector[0].port);
}