Add request_id to HttpRequestInfo and pass it to the NetworkDelegate for events.

net/http/http_network_transaction.h

Index: net/http/http_network_transaction.h
diff --git a/net/http/http_network_transaction.h b/net/http/http_network_transaction.h
index 3cec010aedaeb13363c19fee158f22969fec9844..a7b5803dc98179c6febda8a0b724e09be2a7940e 100644
--- a/net/http/http_network_transaction.h
+++ b/net/http/http_network_transaction.h
@@ -95,6 +95,7 @@ class HttpNetworkTransaction : public HttpTransaction,
     STATE_GENERATE_SERVER_AUTH_TOKEN,
     STATE_GENERATE_SERVER_AUTH_TOKEN_COMPLETE,
     STATE_SEND_REQUEST,
+    STATE_SEND_REQUEST_INTERCEPT_COMPLETE,

[willchan no longer on Chromium, 2011/03/17 15:55:54]

This is unconventional for net/ state machine logic. We try to have a
STATE_FOO_COMPLETE for each STATE_FOO. I recommend you do:

STATE_BUILD_REQUEST,
STATE_BUILD_REQUEST_COMPLETE,
STATE_SEND_REQUEST,
STATE_SEND_REQUEST_COMPLETE

It's OK that the bodies are fairly trivial. This breakdown should make the code
more consistent with the rest of our code.

[Matt Perry, 2011/03/22 21:11:43]

Done.

     STATE_SEND_REQUEST_COMPLETE,
     STATE_READ_HEADERS,
     STATE_READ_HEADERS_COMPLETE,
@@ -126,6 +127,7 @@ class HttpNetworkTransaction : public HttpTransaction,
   int DoGenerateServerAuthToken();
   int DoGenerateServerAuthTokenComplete(int result);
   int DoSendRequest();
+  int DoSendRequestInterceptComplete(int result);
   int DoSendRequestComplete(int result);
   int DoReadHeaders();
   int DoReadHeadersComplete(int result);
@@ -218,6 +220,7 @@ class HttpNetworkTransaction : public HttpTransaction,
 
   CompletionCallbackImpl<HttpNetworkTransaction> io_callback_;
   CompletionCallback* user_callback_;
+  scoped_ptr<UploadDataStream> request_body_;
 
   scoped_refptr<HttpNetworkSession> session_;