Change "spdy_priority" to "priority" in NetLog.

This is the last piece of user-facing "SPDY" string in chrome://net-internals.
Instead of "http2_priority", I propose to change it to "priority", since there
is no ambiguity anyway.

BUG=456986

Review URL: https://codereview.chromium.org/963573002

Cr-Commit-Position: refs/heads/master@{#318518}

2 files changed, 14 insertions, 5 deletions

diff --git a/net/base/net_log_event_type_list.h b/net/base/net_log_event_type_list.h
index 3b286f9..586dd78 100644
--- a/net/base/net_log_event_type_list.h
+++ b/net/base/net_log_event_type_list.h
@@ -1114,7 +1114,10 @@ EVENT_TYPE(HTTP2_SESSION_INITIALIZED)
 //   {
 //     "flags": <The control frame flags>,
 //     "headers": <The list of header:value pairs>,
-//     "id": <The stream id>,
+//     "fin": <True if this is the final data set by the peer on this stream>,
+//     "unidirectional": <True if this stream is unidirectional>,
+//     "priority": <The priority value of the stream>,
+//     "stream_id": <The stream id>,
 //   }
 EVENT_TYPE(HTTP2_SESSION_SYN_STREAM)
 
@@ -1125,7 +1128,10 @@ EVENT_TYPE(HTTP2_SESSION_SYN_STREAM)
 //   {
 //     "flags": <The control frame flags>,
 //     "headers": <The list of header:value pairs>,
-//     "id": <The stream id>,
+//     "fin": <True if this is the final data set by the peer on this stream>,
+//     "unidirectional": <True if this stream is unidirectional>,
+//     "priority": <The priority value of the stream>,
+//     "stream_id": <The stream id>,
 //     "associated_stream": <The stream id>,
 //   }
 EVENT_TYPE(HTTP2_SESSION_PUSHED_SYN_STREAM)
@@ -1135,7 +1141,10 @@ EVENT_TYPE(HTTP2_SESSION_PUSHED_SYN_STREAM)
 //   {
 //     "flags": <The control frame flags>,
 //     "headers": <The list of header:value pairs>,
-//     "id": <The stream id>,
+//     "fin": <True if this is the final data set by the peer on this stream>,
+//     "unidirectional": <True if this stream is unidirectional>,
+//     "priority": <The priority value of the stream>,
+//     "stream_id": <The stream id>,
 //   }
 EVENT_TYPE(HTTP2_SESSION_SEND_HEADERS)
 
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc
index a5a1ea6..f118b72 100644
--- a/net/spdy/spdy_session.cc
+++ b/net/spdy/spdy_session.cc
@@ -81,7 +81,7 @@ base::Value* NetLogSpdySynStreamSentCallback(const SpdyHeaderBlock* headers,
             SpdyHeaderBlockToListValue(*headers, log_level).release());
   dict->SetBoolean("fin", fin);
   dict->SetBoolean("unidirectional", unidirectional);
-  dict->SetInteger("spdy_priority", static_cast<int>(spdy_priority));
+  dict->SetInteger("priority", static_cast<int>(spdy_priority));
   dict->SetInteger("stream_id", stream_id);
   return dict;
 }
@@ -99,7 +99,7 @@ base::Value* NetLogSpdySynStreamReceivedCallback(
             SpdyHeaderBlockToListValue(*headers, log_level).release());
   dict->SetBoolean("fin", fin);
   dict->SetBoolean("unidirectional", unidirectional);
-  dict->SetInteger("spdy_priority", static_cast<int>(spdy_priority));
+  dict->SetInteger("priority", static_cast<int>(spdy_priority));
   dict->SetInteger("stream_id", stream_id);
   dict->SetInteger("associated_stream", associated_stream);
   return dict;