summaryrefslogtreecommitdiff
path: root/chromium/net/log/net_log_event_type_list.h
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/net/log/net_log_event_type_list.h')
-rw-r--r--chromium/net/log/net_log_event_type_list.h157
1 files changed, 94 insertions, 63 deletions
diff --git a/chromium/net/log/net_log_event_type_list.h b/chromium/net/log/net_log_event_type_list.h
index 4ac7d8b1f1f..ec5cc418486 100644
--- a/chromium/net/log/net_log_event_type_list.h
+++ b/chromium/net/log/net_log_event_type_list.h
@@ -475,7 +475,7 @@ EVENT_TYPE(SSL_CLIENT_CERT_REQUESTED)
// "type": <type of the key>,
// "hash": <hash function used>,
// }
-EVENT_TYPE(SSL_PRIVATE_KEY_OPERATION)
+EVENT_TYPE(SSL_PRIVATE_KEY_OP)
// The start/end of getting a domain-bound certificate and private key.
//
@@ -797,7 +797,7 @@ EVENT_TYPE(BACKUP_CONNECT_JOB_CREATED)
// }
EVENT_TYPE(SOCKET_POOL_BOUND_TO_CONNECT_JOB)
-// Identifies the NetLog::Source() for the Socket assigned to the pending
+// Identifies the NetLogSource() for the Socket assigned to the pending
// request. The event parameters are:
// {
// "source_dependency": <Source identifier for the socket we acquired>,
@@ -1043,21 +1043,21 @@ EVENT_TYPE(HTTP_STREAM_REQUEST)
// }
EVENT_TYPE(HTTP_STREAM_JOB)
-// Identifies the NetLog::Source() for a Job started by the Request.
+// Identifies the NetLogSource() for a Job started by the Request.
// The event parameters are:
// {
// "source_dependency": <Source identifier for Job we started>,
// }
EVENT_TYPE(HTTP_STREAM_REQUEST_STARTED_JOB)
-// Identifies the NetLog::Source() for the Job that fulfilled the Request.
+// Identifies the NetLogSource() for the Job that fulfilled the Request.
// The event parameters are:
// {
// "source_dependency": <Source identifier for Job we acquired>,
// }
EVENT_TYPE(HTTP_STREAM_REQUEST_BOUND_TO_JOB)
-// Identifies the NetLog::Source() for the Request that the Job was attached to.
+// Identifies the NetLogSource() for the Request that the Job was attached to.
// The event parameters are:
// {
// "source_dependency": <Source identifier for the Request to which we were
@@ -1188,6 +1188,23 @@ EVENT_TYPE(HTTP_TRANSACTION_RESTART_AFTER_ERROR)
// }
EVENT_TYPE(BIDIRECTIONAL_STREAM_ALIVE)
+// Marks the ReadData call of a net::BidirectionalStream.
+// The following parameters are attached:
+// {
+// "rv": <The value in int that is returned to the caller>
+// }
+EVENT_TYPE(BIDIRECTIONAL_STREAM_READ_DATA)
+
+// Marks the SendData call of a net::BidirectionalStream.
+EVENT_TYPE(BIDIRECTIONAL_STREAM_SEND_DATA)
+
+// Marks the SendvData call of a net::BidirectionalStream.
+// The following parameters are attached:
+// {
+// "num_buffers": <The number of buffers passed to SendvData>
+// }
+EVENT_TYPE(BIDIRECTIONAL_STREAM_SENDV_DATA)
+
// Marks the beginning/end of buffers sent in a net::BidirectionalStream.
// The following parameters are attached:
// {
@@ -1261,34 +1278,6 @@ EVENT_TYPE(HTTP2_SESSION)
// }
EVENT_TYPE(HTTP2_SESSION_INITIALIZED)
-// This event is sent for a SPDY SYN_STREAM. Note that there is no SYN_STREAM
-// frame in HTTP/2.
-// The following parameters are attached:
-// {
-// "flags": <The control frame flags>,
-// "headers": <The list of header:value pairs>,
-// "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)
-
-// This event is sent for a SPDY SYN_STREAM pushed by the server, where a
-// net::URLRequest is already waiting for the stream. Note that there is no
-// SYN_STREAM frame in HTTP/2.
-// The following parameters are attached:
-// {
-// "flags": <The control frame flags>,
-// "headers": <The list of header:value pairs>,
-// "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)
-
// This event is sent for sending an HTTP/2 HEADERS frame.
// The following parameters are attached:
// {
@@ -1302,7 +1291,7 @@ EVENT_TYPE(HTTP2_SESSION_PUSHED_SYN_STREAM)
// }
EVENT_TYPE(HTTP2_SESSION_SEND_HEADERS)
-// This event is sent for receiving an HTTP/2 (or SPDY) HEADERS frame.
+// This event is sent for receiving an HTTP/2 HEADERS frame.
// The following parameters are attached:
// {
// "flags": <The control frame flags>,
@@ -1311,24 +1300,14 @@ EVENT_TYPE(HTTP2_SESSION_SEND_HEADERS)
// }
EVENT_TYPE(HTTP2_SESSION_RECV_HEADERS)
-// This event is sent for a SPDY SYN_REPLY. Not that there is no SYN_REPLY
-// frame in HTTP/2.
-// The following parameters are attached:
-// {
-// "flags": <The control frame flags>,
-// "headers": <The list of header:value pairs>,
-// "id": <The stream id>,
-// }
-EVENT_TYPE(HTTP2_SESSION_SYN_REPLY)
-
-// On sending an HTTP/2 (or SPDY) SETTINGS frame.
+// On sending an HTTP/2 SETTINGS frame.
// The following parameters are attached:
// {
// "settings": <The list of setting id, flags and value>,
// }
EVENT_TYPE(HTTP2_SESSION_SEND_SETTINGS)
-// Receipt of an HTTP/2 (or SPDY) SETTINGS frame is received.
+// Receipt of an HTTP/2 SETTINGS frame.
// The following parameters are attached:
// {
// "host": <The host-port string>,
@@ -1337,7 +1316,7 @@ EVENT_TYPE(HTTP2_SESSION_SEND_SETTINGS)
// }
EVENT_TYPE(HTTP2_SESSION_RECV_SETTINGS)
-// Receipt of an individual HTTP/2 (or SPDY) setting.
+// Receipt of an individual HTTP/2 setting.
// The following parameters are attached:
// {
// "id": <The setting id>,
@@ -1346,7 +1325,7 @@ EVENT_TYPE(HTTP2_SESSION_RECV_SETTINGS)
// }
EVENT_TYPE(HTTP2_SESSION_RECV_SETTING)
-// The receipt of a RST_STREAM
+// The receipt of a RST_STREAM frame.
// The following parameters are attached:
// {
// "stream_id": <The stream ID for the window update>,
@@ -1363,7 +1342,7 @@ EVENT_TYPE(HTTP2_SESSION_RST_STREAM)
// }
EVENT_TYPE(HTTP2_SESSION_SEND_RST_STREAM)
-// Sending of an HTTP/2 (or SPDY) PING frame.
+// Sending of an HTTP/2 PING frame.
// The following parameters are attached:
// {
// "unique_id": <The unique id of the PING message>,
@@ -1371,7 +1350,7 @@ EVENT_TYPE(HTTP2_SESSION_SEND_RST_STREAM)
// }
EVENT_TYPE(HTTP2_SESSION_PING)
-// Receipt of an HTTP/2 (or SPDY) GOAWAY frame.
+// Receipt of an HTTP/2 GOAWAY frame.
// The following parameters are attached:
// {
// "last_accepted_stream_id": <Last stream id accepted by the server, duh>,
@@ -1381,15 +1360,14 @@ EVENT_TYPE(HTTP2_SESSION_PING)
// }
EVENT_TYPE(HTTP2_SESSION_GOAWAY)
-// Receipt of an HTTP/2 (or SPDY) WINDOW_UPDATE frame (which controls the send
-// window).
+// Receipt of an HTTP/2 WINDOW_UPDATE frame (which controls the send window).
// {
// "stream_id": <The stream ID for the window update>,
// "delta" : <The delta window size>,
// }
EVENT_TYPE(HTTP2_SESSION_RECEIVED_WINDOW_UPDATE_FRAME)
-// Sending of an HTTP/2 (or SPDY) WINDOW_UPDATE frame (which controls the
+// Sending of an HTTP/2 WINDOW_UPDATE frame (which controls the
// receive window).
// {
// "stream_id": <The stream ID for the window update>,
@@ -1427,7 +1405,7 @@ EVENT_TYPE(HTTP2_SESSION_SEND_DATA)
// }
EVENT_TYPE(HTTP2_SESSION_RECV_DATA)
-// This event is sent for receiving an HTTP/2 (or SPDY) PUSH_PROMISE frame.
+// This event is sent for receiving an HTTP/2 PUSH_PROMISE frame.
// The following parameters are attached:
// {
// "headers": <The list of header:value pairs>,
@@ -1489,8 +1467,8 @@ EVENT_TYPE(HTTP2_SESSION_POOL_FOUND_EXISTING_SESSION_FROM_IP_POOL)
// }
EVENT_TYPE(HTTP2_SESSION_POOL_CREATED_NEW_SESSION)
-// This event indicates that a SSL socket has been upgraded to an HTTP/2 (or
-// SPDY) session.
+// This event indicates that a SSL socket has been upgraded to an HTTP/2
+// session.
// {
// "source_dependency": <The session id>,
// }
@@ -1506,7 +1484,7 @@ EVENT_TYPE(HTTP2_SESSION_POOL_REMOVE_SESSION)
// SpdyStream
// ------------------------------------------------------------------------
-// The begin and end of an HTTP/2 (or SPDY) STREAM.
+// The begin and end of an HTTP/2 STREAM.
EVENT_TYPE(HTTP2_STREAM)
// A stream is attached to a pushed stream.
@@ -1548,7 +1526,7 @@ EVENT_TYPE(HTTP2_STREAM_ERROR)
// ------------------------------------------------------------------------
EVENT_TYPE(HTTP2_PROXY_CLIENT_SESSION)
-// Identifies the HTTP/2 (or SPDY) session a source is using.
+// Identifies the HTTP/2 session a source is using.
// {
// "source_dependency": <Source identifier for the underlying session>,
// }
@@ -1906,7 +1884,7 @@ EVENT_TYPE(QUIC_HTTP_STREAM_PUSH_PROMISE_RENDEZVOUS)
// }
EVENT_TYPE(QUIC_HTTP_STREAM_ADOPTED_PUSH_STREAM)
-// Identifies the NetLog::Source() for the QuicSesssion that handled the stream.
+// Identifies the NetLogSource() for the QuicSesssion that handled the stream.
// The event parameters are:
// {
// "source_dependency": <Source identifier for session that was used>,
@@ -2484,6 +2462,12 @@ EVENT_TYPE(DOWNLOAD_URL_REQUEST)
// one of these events.
EVENT_TYPE(DOWNLOAD_ITEM_ACTIVE)
+// Recorded when the DownloadFile is created.
+// {
+// "source_dependency": <Source ID of DownloadFile>
+// }
+EVENT_TYPE(DOWNLOAD_FILE_CREATED)
+
// This event is created when a download item's danger type
// has been modified.
// {
@@ -2546,6 +2530,12 @@ EVENT_TYPE(DOWNLOAD_ITEM_CANCELED)
// DownloadFile events.
// ------------------------------------------------------------------------
+// A new download file was created.
+// {
+// "source_dependency": <Source ID of owning DownloadItem>
+// }
+EVENT_TYPE(DOWNLOAD_FILE_ACTIVE)
+
// This event is created when a download file is opened, and lasts until
// the file is closed.
// The BEGIN event has the following parameters:
@@ -2563,6 +2553,13 @@ EVENT_TYPE(DOWNLOAD_FILE_OPENED)
// }
EVENT_TYPE(DOWNLOAD_STREAM_DRAINED)
+// Created when a buffer is written to the download file. The END event has the
+// following paramters:
+// {
+// "bytes": <Count of bytes written>
+// }
+EVENT_TYPE(DOWNLOAD_FILE_WRITTEN)
+
// This event is created when a download file is renamed.
// {
// "old_filename": <Old filename>,
@@ -2570,10 +2567,6 @@ EVENT_TYPE(DOWNLOAD_STREAM_DRAINED)
// }
EVENT_TYPE(DOWNLOAD_FILE_RENAMED)
-// This event is created when a download file is closed. This event is allowed
-// to occur even if the file is not open.
-EVENT_TYPE(DOWNLOAD_FILE_CLOSED)
-
// This event is created when a download file is detached.
EVENT_TYPE(DOWNLOAD_FILE_DETACHED)
@@ -3026,3 +3019,41 @@ EVENT_TYPE(SAFE_BROWSING_CHECKING_URL)
// "resumed_redirect", "unchecked_redirect">
// }
EVENT_TYPE(SAFE_BROWSING_DEFERRED)
+
+// The start/end of a Safe Browsing ping being sent.
+//
+// The BEGIN phase contains the following parameters:
+// {
+// "url": <The URL the ping is going to, which identifies the type of ping
+// that is being sent (eg: ThreatReport, SafeBrowsingHit)>
+// "data": <The base64 encoding of the payload sent with the ping>
+//
+// The END phase contains the following parameters:
+// {
+// "status": <The integer status of the report transmission. Corresponds to
+// URLRequestStatus::Status>
+// "error": <The error code returned by the server, 0 indicating success>
+EVENT_TYPE(SAFE_BROWSING_PING)
+
+// Marks start of UploadDataStream that is logged on initialization.
+// The END phase contains the following parameters:
+// {
+// "net_error": <Result of the initialization step>,
+// "total_size": <Shows total content length>,
+// "is_chunked": <Shows whether data is chunked or not>
+// }
+EVENT_TYPE(UPLOAD_DATA_STREAM_INIT)
+
+// The start/end of UploadDataStream::Read method.
+//
+// The BEGIN phase contains the following information:
+// {
+// "current_position": <Shows current read position>,
+// }
+//
+// The END phase contains the following information:
+// {
+// "result": <Result of reading. Result > 0 is bytes read. Result == 0 means
+// the end of file. Result < 0 means an error.>
+// }
+EVENT_TYPE(UPLOAD_DATA_STREAM_READ)