Eliminate the establishing_tunnel_ internal state and move to explicit...

net/base/net_log_event_type_list.h

Index: net/base/net_log_event_type_list.h
===================================================================
--- net/base/net_log_event_type_list.h	(revision 48060)
+++ net/base/net_log_event_type_list.h	(working copy)
@@ -337,24 +337,38 @@
 // HttpNetworkTransaction
 // ------------------------------------------------------------------------
 
-// Measures the time taken to send the request to the server.
-EVENT_TYPE(HTTP_TRANSACTION_SEND_REQUEST)
+// Measures the time taken to send the tunnel request to the server.
+EVENT_TYPE(HTTP_TRANSACTION_TUNNEL_SEND_REQUEST)
 
-// This event is sent for a HTTP request.
+// This event is sent for a tunnel request.
 // The following parameters are attached:
 //   {
 //     "line": <The HTTP request line, CRLF terminated>,
 //     "headers": <The list of header:value pairs>
 //   }
-EVENT_TYPE(HTTP_TRANSACTION_SEND_REQUEST_HEADERS)
+EVENT_TYPE(HTTP_TRANSACTION_SEND_TUNNEL_HEADERS)
 
-// This event is sent for a tunnel request.
+// Measures the time to read the tunnel response headers from the server.
+EVENT_TYPE(HTTP_TRANSACTION_TUNNEL_READ_HEADERS)
+
+// This event is sent on receipt of the HTTP response headers to a tunnel
+// request.
 // The following parameters are attached:
 //   {
+//     "headers": <The list of header:value pairs>
+//   }
+EVENT_TYPE(HTTP_TRANSACTION_READ_TUNNEL_RESPONSE_HEADERS)
+
+// Measures the time taken to send the request to the server.
+EVENT_TYPE(HTTP_TRANSACTION_SEND_REQUEST)
+
+// This event is sent for a HTTP request.
+// The following parameters are attached:
+//   {
 //     "line": <The HTTP request line, CRLF terminated>,
 //     "headers": <The list of header:value pairs>
 //   }
-EVENT_TYPE(HTTP_TRANSACTION_SEND_TUNNEL_HEADERS)
+EVENT_TYPE(HTTP_TRANSACTION_SEND_REQUEST_HEADERS)
 
 // Measures the time to read HTTP response headers from the server.
 EVENT_TYPE(HTTP_TRANSACTION_READ_HEADERS)
@@ -366,14 +380,6 @@
 //   }
 EVENT_TYPE(HTTP_TRANSACTION_READ_RESPONSE_HEADERS)
 
-// This event is sent on receipt of the HTTP response headers to a tunnel
-// request.
-// The following parameters are attached:
-//   {
-//     "headers": <The list of header:value pairs>
-//   }
-EVENT_TYPE(HTTP_TRANSACTION_READ_TUNNEL_RESPONSE_HEADERS)
-
 // Measures the time to resolve the canonical name for HTTP Negotiate
 // authentication scheme.
 EVENT_TYPE(HTTP_TRANSACTION_RESOLVE_CANONICAL_NAME)