Make cancel remove cancelled download from active queues at time of cancel.

content/browser/net/url_request_slow_download_job.h

Index: content/browser/net/url_request_slow_download_job.h
diff --git a/content/browser/net/url_request_slow_download_job.h b/content/browser/net/url_request_slow_download_job.h
index cef2adcadff9322a986138da57974994178b6737..0104213931ca327624287fcbd32955d178cf645e 100644
--- a/content/browser/net/url_request_slow_download_job.h
+++ b/content/browser/net/url_request_slow_download_job.h
@@ -1,9 +1,13 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 // This class simulates a slow download.  This used in a UI test to test the

[eroman, 2011/09/10 01:53:50]

nit: "This is used" (not from your change).

[Randy Smith (Not in Mondays), 2011/09/10 16:14:38]

Done.

 // download manager.  Requests to |kUnknownSizeUrl| and |kKnownSizeUrl| start
-// downloads that pause after the first
+// downloads that pause after the first chunk of data is delivered.
+// A later request to |kFinishDownloadUrl| will finish these downloads.
+// A later request to |kErrorFinishDownloadUrl| will cause these
+// downloads to error with |net::ERR_FAILED|.
+// TODO(rdsmith): Update to allow control of returned error.
 
 #ifndef CONTENT_BROWSER_NET_URL_REQUEST_SLOW_DOWNLOAD_JOB_H_
 #define CONTENT_BROWSER_NET_URL_REQUEST_SLOW_DOWNLOAD_JOB_H_
@@ -36,6 +40,7 @@ class URLRequestSlowDownloadJob : public net::URLRequestJob {
   static const char kUnknownSizeUrl[];
   static const char kKnownSizeUrl[];
   static const char kFinishDownloadUrl[];
+  static const char kErrorFinishDownloadUrl[];
 
   // Adds the testing URLs to the net::URLRequestFilter.
   static void AddUrlHandler();
@@ -46,17 +51,19 @@ class URLRequestSlowDownloadJob : public net::URLRequestJob {
   void GetResponseInfoConst(net::HttpResponseInfo* info) const;
 
   // Mark all pending requests to be finished.  We keep track of pending
-  // requests in |kPendingRequests|.
-  static void FinishPendingRequests();
-  static std::vector<URLRequestSlowDownloadJob*> kPendingRequests;
+  // requests in |pending_requests_|.
+  static void FinishPendingRequests(bool error);
+  static std::vector<URLRequestSlowDownloadJob*> pending_requests_;
 
   void StartAsync();
 
   void set_should_finish_download() { should_finish_download_ = true; }
+  void set_should_error_download() { should_error_download_ = true; }
 
   int first_download_size_remaining_;
   bool should_finish_download_;
   bool should_send_second_chunk_;
+  bool should_error_download_;
 
   ScopedRunnableMethodFactory<URLRequestSlowDownloadJob> method_factory_;
 };