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

net/url_request/url_request_test_util.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/url_request/url_request_test_util.h"
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/threading/thread.h"
@@ skipping 278 matching lines @@
     MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask());
 }
 
 TestNetworkDelegate::TestNetworkDelegate()
   : last_os_error_(0),
     error_count_(0) {
 }
 
 TestNetworkDelegate::~TestNetworkDelegate() {}
 
-bool TestNetworkDelegate::OnBeforeURLRequest(
+int TestNetworkDelegate::OnBeforeURLRequest(
     net::URLRequest* request, net::CompletionCallback* callback) {
-  return false;
+  return net::OK;
 }
 
-void TestNetworkDelegate::OnSendHttpRequest(
-    net::HttpRequestHeaders* headers) {
+int TestNetworkDelegate::OnBeforeSendHeaders(
+    uint64 request_id,
+    net::HttpRequestHeaders* headers,
+    net::CompletionCallback* callback) {
+  return net::OK;
 }
 
 void TestNetworkDelegate::OnResponseStarted(net::URLRequest* request) {
   if (request->status().status() == net::URLRequestStatus::FAILED) {
     error_count_++;
     last_os_error_ = request->status().os_error();
   }
 }
 
 void TestNetworkDelegate::OnReadCompleted(net::URLRequest* request,
                                               int bytes_read) {
   if (request->status().status() == net::URLRequestStatus::FAILED) {
     error_count_++;
     last_os_error_ = request->status().os_error();
   }
 }
 
+void TestNetworkDelegate::OnURLRequestDestroyed(net::URLRequest* request) {
+}
+
 net::URLRequestJob* TestNetworkDelegate::OnMaybeCreateURLRequestJob(
     net::URLRequest* request) {
   return NULL;
 }