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

chrome/browser/extensions/extension_webrequest_api.h

Index: chrome/browser/extensions/extension_webrequest_api.h
diff --git a/chrome/browser/extensions/extension_webrequest_api.h b/chrome/browser/extensions/extension_webrequest_api.h
index 0cd52a35093d3a9717b59330f23cc6eaf13e7be2..9a3019bddf6ada1625427a6d8bc3e9d50a461bae 100644
--- a/chrome/browser/extensions/extension_webrequest_api.h
+++ b/chrome/browser/extensions/extension_webrequest_api.h
@@ -21,6 +21,7 @@ class ExtensionEventRouterForwarder;
 class GURL;
 
 namespace net {
+class HttpRequestHeaders;
 class URLRequest;
 }
 
@@ -41,6 +42,14 @@ class ExtensionWebRequestEventRouter {
                        net::URLRequest* request,
                        net::CompletionCallback* callback);
 
+  // Same as above, but for HTTP(s) requests. This version includes the request
+  // headers about to be sent.
+  bool OnBeforeHttpRequest(ProfileId profile_id,
+                           ExtensionEventRouterForwarder* event_router,
+                           uint64 request_id,
+                           net::HttpRequestHeaders* headers,
+                           net::CompletionCallback* callback);
+
   // Called when an event listener handles a blocking event and responds.
   // TODO(mpcomplete): modify request
   void OnEventHandled(
@@ -76,10 +85,21 @@ class ExtensionWebRequestEventRouter {
   typedef std::map<std::string, std::set<EventListener> > ListenerMapForProfile;
   typedef std::map<ProfileId, ListenerMapForProfile> ListenerMap;
   typedef std::map<uint64, BlockedRequest> BlockedRequestMap;
+  typedef std::map<uint64, net::URLRequest*> HttpRequestMap;
 
   ExtensionWebRequestEventRouter();
   ~ExtensionWebRequestEventRouter();
 
+  bool OnBeforeRequestCommon(
+      ProfileId profile_id,
+      ExtensionEventRouterForwarder* event_router,
+      net::URLRequest* request,
+      net::CompletionCallback* callback,
+      int tab_id,
+      int window_id,
+      ResourceType::Type resource_type,
+      const std::vector<const EventListener*>& listeners);
+
   // Returns a list of event listeners that care about the given event, based
   // on their filter parameters.
   std::vector<const EventListener*> GetMatchingListeners(
@@ -98,6 +118,10 @@ class ExtensionWebRequestEventRouter {
   // to respond.
   BlockedRequestMap blocked_requests_;
 
+  // A map of HTTP(s) network requests. We don't dispatch onBeforeRequest for
+  // these requests until headers are available.
+  HttpRequestMap http_requests_;
+
   DISALLOW_COPY_AND_ASSIGN(ExtensionWebRequestEventRouter);
 };