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

Unified Diff: net/http/http_server_properties_manager.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
Index: net/http/http_server_properties_manager.cc
diff --git a/net/http/http_server_properties_manager.cc b/net/http/http_server_properties_manager.cc
index 1f91bb691d9dafcf834710962d247e5188cd8ec3..18f3edf3bdee7dc735c47325a8710fe0aa9238e1 100644
--- a/net/http/http_server_properties_manager.cc
+++ b/net/http/http_server_properties_manager.cc
@@ -632,7 +632,7 @@ bool HttpServerPropertiesManager::ParseAlternativeServiceDict(
<< server_str;
return false;
}
- AlternateProtocol protocol = AlternateProtocolFromString(protocol_str);
+ NextProto protocol = NextProtoFromString(protocol_str);
if (!IsAlternateProtocolValid(protocol)) {
DVLOG(1) << "Invalid alternative service protocol string for server: "
<< server_str;
@@ -1189,7 +1189,7 @@ void HttpServerPropertiesManager::SaveAlternativeServiceToServerPrefs(
alternative_service_dict->SetString(kHostKey, alternative_service.host);
}
alternative_service_dict->SetString(
- kProtocolKey, AlternateProtocolToString(alternative_service.protocol));
+ kProtocolKey, NextProtoToString(alternative_service.protocol));
// JSON cannot store int64_t, so expiration is converted to a string.
alternative_service_dict->SetString(
kExpirationKey,
« no previous file with comments | « net/http/http_server_properties_impl_unittest.cc ('k') | net/http/http_server_properties_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698