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

net/base/network_delegate.h

Index: net/base/network_delegate.h
diff --git a/net/base/network_delegate.h b/net/base/network_delegate.h
index 284728b40d6c5ab6352643c221e48945d6b11455..56c654df88770dece2a9ed917d074caa09cf8ab6 100644
--- a/net/base/network_delegate.h
+++ b/net/base/network_delegate.h
@@ -34,7 +34,9 @@ class NetworkDelegate : public base::NonThreadSafe {
   // checking on parameters.
   bool NotifyBeforeURLRequest(URLRequest* request,
                               CompletionCallback* callback);
-  void NotifySendHttpRequest(HttpRequestHeaders* headers);
+  bool NotifyBeforeSendHeaders(uint64 request_id,
+                               HttpRequestHeaders* headers,
+                               CompletionCallback* callback);

[rvargas (doing something else), 2011/03/23 00:54:35]

You should document the expected behavior of this code related to the lifetime
of the caller and the |headers|. (do you expect a CacelableCompletionCallback to
be also used with NotifyBeforeURLRequest?)

[Matt Perry, 2011/03/24 00:11:25]

Done.

   void NotifyResponseStarted(URLRequest* request);
   void NotifyReadCompleted(URLRequest* request, int bytes_read);
 
@@ -57,7 +59,9 @@ class NetworkDelegate : public base::NonThreadSafe {
 
   // Called right before the HTTP headers are sent.  Allows the delegate to
   // read/write |headers| before they get sent out.
-  virtual void OnSendHttpRequest(HttpRequestHeaders* headers) = 0;
+  virtual bool OnBeforeSendHeaders(uint64 request_id,
+                                   HttpRequestHeaders* headers,
+                                   CompletionCallback* callback) = 0;
 
   // This corresponds to URLRequestDelegate::OnResponseStarted.
   virtual void OnResponseStarted(URLRequest* request) = 0;