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

net/base/network_delegate.cc

 // 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.
 
 #include "net/base/network_delegate.h"
 
 #include "base/logging.h"
 
 namespace net {
 
 bool NetworkDelegate::NotifyBeforeURLRequest(URLRequest* request,
                                              CompletionCallback* callback) {
   DCHECK(CalledOnValidThread());
   DCHECK(request);
   DCHECK(callback);
   return OnBeforeURLRequest(request, callback);
 }
 
-void NetworkDelegate::NotifySendHttpRequest(HttpRequestHeaders* headers) {
+bool NetworkDelegate::NotifyBeforeHttpRequest(uint64 request_id,

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

Should we DCHECK_NE(0, request_id)?

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

Not all HTTP requests come from URLRequests, so those will have invalid IDs and
won't be in our map, and we just ignore them. These are things like preconnect
and websocket.

+                                              HttpRequestHeaders* headers,
+                                              CompletionCallback* callback) {
   DCHECK(CalledOnValidThread());
   DCHECK(headers);
-  OnSendHttpRequest(headers);
+  DCHECK(callback);
+  return OnBeforeHttpRequest(request_id, headers, callback);
 }
 
 void NetworkDelegate::NotifyResponseStarted(URLRequest* request) {
   DCHECK(CalledOnValidThread());
   DCHECK(request);
   OnResponseStarted(request);
 }
 
 void NetworkDelegate::NotifyReadCompleted(URLRequest* request, int bytes_read) {
   DCHECK(CalledOnValidThread());
   DCHECK(request);
   OnReadCompleted(request, bytes_read);
 }
 
 URLRequestJob* NetworkDelegate::MaybeCreateURLRequestJob(URLRequest* request) {
   DCHECK(CalledOnValidThread());
   DCHECK(request);
   return OnMaybeCreateURLRequestJob(request);
 }
 
 }  // namespace net