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

net/url_request/url_request.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.h"
 
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/metrics/stats_counters.h"
 #include "base/singleton.h"
@@ skipping 25 matching lines @@
 // Discard headers which have meaning in POST (Content-Length, Content-Type,
 // Origin).
 void StripPostSpecificHeaders(net::HttpRequestHeaders* headers) {
   // These are headers that may be attached to a POST.
   headers->RemoveHeader(net::HttpRequestHeaders::kContentLength);
   headers->RemoveHeader(net::HttpRequestHeaders::kContentType);
   headers->RemoveHeader(net::HttpRequestHeaders::kOrigin);
 }
 
 // This counter keeps track of the identifiers used for URL requests so far.
-uint64 g_next_url_request_identifier = 0;
+// 0 is reserved to represent an invalid ID.
+uint64 g_next_url_request_identifier = 1;
 
 // This lock protects g_next_url_request_identifier.
 base::Lock g_next_url_request_identifier_lock;
 
 // Returns an prior unused identifier for URL requests.
 uint64 GenerateURLRequestIdentifier() {
   base::AutoLock lock(g_next_url_request_identifier_lock);
   return g_next_url_request_identifier++;
 }
 
@@ skipping 67 matching lines @@
   SIMPLE_STATS_COUNTER("URLRequestCount");
 
   // Sanity check out environment.
   DCHECK(MessageLoop::current()) <<
       "The current MessageLoop must exist";
   DCHECK_EQ(MessageLoop::TYPE_IO, MessageLoop::current()->type()) <<
       "The current MessageLoop must be TYPE_IO";
 }
 
 URLRequest::~URLRequest() {
+  if (context_ && context_->network_delegate())
+    context_->network_delegate()->NotifyURLRequestDestroyed(this);
+
   if (before_request_callback_)
     before_request_callback_->Cancel();
 
   Cancel();
 
   if (job_)
     OrphanJob();
 
   set_context(NULL);
 }
@@ skipping 212 matching lines @@
   return ret;
 }
 
 void URLRequest::Start() {
   response_info_.request_time = Time::Now();
 
   if (context_ && context_->network_delegate()) {
     before_request_callback_ = new CancelableCompletionCallback<URLRequest>(
         this, &URLRequest::BeforeRequestComplete);
     if (context_->network_delegate()->NotifyBeforeURLRequest(
-            this, before_request_callback_)) {
+            this, before_request_callback_) == net::ERR_IO_PENDING) {
       before_request_callback_->AddRef();  // balanced in BeforeRequestComplete
       net_log_.BeginEvent(NetLog::TYPE_URL_REQUEST_BLOCKED_ON_EXTENSION, NULL);
       return;  // paused
     }
   }
 
   StartJob(URLRequestJobManager::GetInstance()->CreateJob(this));
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ skipping 287 matching lines @@
   if (found != user_data_.end())
     return found->second.get();
   return NULL;
 }
 
 void URLRequest::SetUserData(const void* key, UserData* data) {
   user_data_[key] = linked_ptr<UserData>(data);
 }
 
 }  // namespace net