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

chrome/browser/net/chrome_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 "chrome/browser/net/chrome_network_delegate.h"
 
 #include "base/logging.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/extensions/extension_event_router_forwarder.h"
 #include "chrome/browser/extensions/extension_proxy_api.h"
@@ skipping 33 matching lines @@
 }
 
 ChromeNetworkDelegate::~ChromeNetworkDelegate() {}
 
 bool ChromeNetworkDelegate::OnBeforeURLRequest(
     net::URLRequest* request, net::CompletionCallback* callback) {
   return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest(
       profile_id_, event_router_.get(), request, callback);
 }
 
-void ChromeNetworkDelegate::OnSendHttpRequest(
-    net::HttpRequestHeaders* headers) {
+bool ChromeNetworkDelegate::OnBeforeHttpRequest(
+    uint64 request_id,
+    net::HttpRequestHeaders* headers,
+    net::CompletionCallback* callback) {
   DCHECK(headers);

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

You can whack this DCHECK(), it should have been validated already by
net::NetworkDelegate.

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

Done.

+  return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeHttpRequest(
+      profile_id_, event_router_.get(), request_id, headers, callback);
 }
 
 void ChromeNetworkDelegate::OnResponseStarted(net::URLRequest* request) {
   ForwardProxyErrors(request, event_router_.get(), profile_id_);
 }
 
 void ChromeNetworkDelegate::OnReadCompleted(net::URLRequest* request,
                                             int bytes_read) {
   ForwardProxyErrors(request, event_router_.get(), profile_id_);
 }
 
 net::URLRequestJob* ChromeNetworkDelegate::OnMaybeCreateURLRequestJob(
       net::URLRequest* request) {
   if (!protocol_handler_registry_)
     return NULL;
   return protocol_handler_registry_->MaybeCreateJob(request);
 }