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

net/base/network_delegate.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_BASE_NETWORK_DELEGATE_H_
 #define NET_BASE_NETWORK_DELEGATE_H_
 #pragma once
 
 #include "base/threading/non_thread_safe.h"
 #include "net/base/completion_callback.h"
@@ skipping 16 matching lines @@
 
 class NetworkDelegate : public base::NonThreadSafe {
  public:
   virtual ~NetworkDelegate() {}
 
   // Notification interface called by the network stack. Note that these
   // functions mostly forward to the private virtuals. They also add some sanity
   // 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);
 
   // Returns a URLRequestJob that will be used to handle the request if
   // non-null.
   // TODO(koz): Currently this is called inside registered ProtocolFactories,
   // so that we can perform Delegate-dependent request handling from the static
   // factories, but ultimately it should be called directly from
   // URLRequestJobManager::CreateJob() as a general override mechanism.
   URLRequestJob* MaybeCreateURLRequestJob(URLRequest* request);
 
  private:
   // This is the interface for subclasses of NetworkDelegate to implement. This
   // member functions will be called by the respective public notification
   // member function, which will perform basic sanity checking.
 
   // Called before a request is sent.

[willchan no longer on Chromium, 2011/03/22 23:05:35]

I missed this earlier, these member functions should document what the return
value indicates.

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

Done.

   virtual bool OnBeforeURLRequest(URLRequest* request,
                                   CompletionCallback* callback) = 0;
 
   // 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;
 
   // This corresponds to URLRequestDelegate::OnReadCompleted.
   virtual void OnReadCompleted(URLRequest* request, int bytes_read) = 0;
 
   // Called before a request is sent and before a URLRequestJob is created to
   // handle the request.
   virtual URLRequestJob* OnMaybeCreateURLRequestJob(URLRequest* request) = 0;
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_NETWORK_DELEGATE_H_