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

Unified Diff: net/http/bidirectional_stream_unittest.cc

Issue 2373663002: Unify enum NextProto and enum AlternateProtocol. (Closed)
Patch Set: Fix compile errors. Created 4 years, 1 month 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
« no previous file with comments | « components/cronet/android/cronet_url_request_context_adapter.cc ('k') | net/http/http_network_session.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/bidirectional_stream_unittest.cc
diff --git a/net/http/bidirectional_stream_unittest.cc b/net/http/bidirectional_stream_unittest.cc
index 2e44f8b58d1008005620956642397855e0f846d3..e55508f41bc16c95072234b8ff4dbc8b624f611a 100644
--- a/net/http/bidirectional_stream_unittest.cc
+++ b/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(kProtoQUIC),
- 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);
}
« no previous file with comments | « components/cronet/android/cronet_url_request_context_adapter.cc ('k') | net/http/http_network_session.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698