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

Unified Diff: net/log/net_log_util.cc

Issue 1084243003: Update NET_INFO_SOURCE macros. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 months 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
« net/base/net_info_source_list.h ('K') | « net/base/net_info_source_list.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/log/net_log_util.cc
diff --git a/net/log/net_log_util.cc b/net/log/net_log_util.cc
index 17d97c2fca30bbe201bff39a3677182cc6e57271..713e62aea3de97a116dd737d66017f4cdd793a54 100644
--- a/net/log/net_log_util.cc
+++ b/net/log/net_log_util.cc
@@ -431,12 +431,12 @@ NET_EXPORT scoped_ptr<base::DictionaryValue> GetNetInfo(
http_network_session->SocketPoolInfoToValue());
}
- if (info_sources & NET_INFO_SPDY_SESSIONS) {
- net_info_dict->Set(NetInfoSourceToString(NET_INFO_SPDY_SESSIONS),
+ if (info_sources & NET_INFO_HTTP2_SESSIONS) {
+ net_info_dict->Set(NetInfoSourceToString(NET_INFO_HTTP2_SESSIONS),
http_network_session->SpdySessionPoolInfoToValue());
}
- if (info_sources & NET_INFO_SPDY_STATUS) {
+ if (info_sources & NET_INFO_HTTP2_STATUS) {
base::DictionaryValue* status_dict = new base::DictionaryValue();
status_dict->SetBoolean("spdy_enabled",
@@ -457,15 +457,15 @@ NET_EXPORT scoped_ptr<base::DictionaryValue> GetNetInfo(
status_dict->SetString("next_protos", next_protos_string);
}
- net_info_dict->Set(NetInfoSourceToString(NET_INFO_SPDY_STATUS),
+ net_info_dict->Set(NetInfoSourceToString(NET_INFO_HTTP2_STATUS),
status_dict);
}
- if (info_sources & NET_INFO_SPDY_ALT_PROTO_MAPPINGS) {
+ if (info_sources & NET_INFO_HTTP2_ALT_SVC_MAPPINGS) {
const net::HttpServerProperties& http_server_properties =
*context->http_server_properties();
net_info_dict->Set(
- NetInfoSourceToString(NET_INFO_SPDY_ALT_PROTO_MAPPINGS),
+ NetInfoSourceToString(NET_INFO_HTTP2_ALT_SVC_MAPPINGS),
http_server_properties.GetAlternativeServiceInfoAsValue());
}
« net/base/net_info_source_list.h ('K') | « net/base/net_info_source_list.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698