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

net/url_request/url_request_unittest.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 "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <shlobj.h>
 #include <windows.h>
 #elif defined(USE_NSS)
@@ skipping 219 matching lines @@
   }
 }
 
 // This is the same as the previous test, but checks that the network delegate
 // registers the error.
 TEST_F(URLRequestTestHTTP, NetworkDelegateTunnelConnectionFailed) {
   ASSERT_TRUE(test_server_.Start());
 
   TestDelegate d;
   {
+    TestNetworkDelegate network_delegate;  // must outlive URLRequest

[Matt Perry, 2011/03/24 22:10:54]

I had to reorder this because of the network delegate call in ~URLRequest.

     net::URLRequest r(GURL("https://www.redirect.com/"), &d);
     scoped_refptr<TestURLRequestContext> context(
         new TestURLRequestContext(test_server_.host_port_pair().ToString()));
-    TestNetworkDelegate network_delegate;
     context->set_network_delegate(&network_delegate);
     r.set_context(context);
 
     r.Start();
     EXPECT_TRUE(r.is_pending());
 
     MessageLoop::current()->Run();
 
     EXPECT_EQ(net::URLRequestStatus::FAILED, r.status().status());
     EXPECT_EQ(net::ERR_TUNNEL_CONNECTION_FAILED, r.status().os_error());
@@ skipping 2140 matching lines @@
   TestURLRequest req(GURL("http://example.com"), &d);
   TestURLRequest other_req(GURL("http://example.com"), &d);
 
   ASSERT_NE(req.identifier(), other_req.identifier());
 }
 
 // Check that a failure to connect to the proxy is reported to the network
 // delegate.
 TEST_F(URLRequestTest, NetworkDelegateProxyError) {
   TestDelegate d;
+  TestNetworkDelegate network_delegate;
   TestURLRequest req(GURL("http://example.com"), &d);
   req.set_method("GET");
 
   scoped_ptr<net::MockHostResolverBase> host_resolver(
       new net::MockHostResolver);
   host_resolver->rules()->AddSimulatedFailure("*");
-  TestNetworkDelegate network_delegate;
   scoped_refptr<TestURLRequestContext> context(
       new TestURLRequestContext("myproxy:70", host_resolver.release()));
   context->set_network_delegate(&network_delegate);
   req.set_context(context);
 
   req.Start();
   MessageLoop::current()->Run();
 
   // Check we see a failed request.
   EXPECT_FALSE(req.status().is_success());
@@ skipping 406 matching lines @@
   net::HttpRequestHeaders headers;
   headers.SetHeader(net::HttpRequestHeaders::kUserAgent, "Lynx (textmode)");
   req.SetExtraRequestHeaders(headers);
   req.Start();
   MessageLoop::current()->Run();
   // If the net tests are being run with ChromeFrame then we need to allow for
   // the 'chromeframe' suffix which is added to the user agent before the
   // closing parentheses.
   EXPECT_TRUE(StartsWithASCII(d.data_received(), "Lynx (textmode", true));
 }