Fix webkit URLRequestJob subtypes to handle Kill() correctly.

webkit/blob/view_blob_internals_job.cc

 // Copyright (c) 2010 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 "webkit/blob/view_blob_internals_job.h"
 
+#include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/format_macros.h"
 #include "base/i18n/number_formatting.h"
 #include "base/i18n/time_formatting.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "net/base/escape.h"
 #include "net/url_request/url_request.h"
 #include "webkit/blob/blob_data.h"
@@ skipping 78 matching lines @@
                       command.c_str());
 }
 
 }  // namespace
 
 namespace webkit_blob {
 
 ViewBlobInternalsJob::ViewBlobInternalsJob(
     net::URLRequest* request, BlobStorageController* blob_storage_controller)
     : URLRequestSimpleJob(request),
-      blob_storage_controller_(blob_storage_controller) {
+      blob_storage_controller_(blob_storage_controller),
+      ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
 }
 
 ViewBlobInternalsJob::~ViewBlobInternalsJob() {
 }
 
 void ViewBlobInternalsJob::Start() {
-  MessageLoop::current()->PostTask(FROM_HERE, NewRunnableMethod(
-      this, &ViewBlobInternalsJob::DoWorkAsync));
+  MessageLoop::current()->PostTask(
+      FROM_HERE,
+      method_factory_.NewRunnableMethod(&ViewBlobInternalsJob::DoWorkAsync));
 }
 
 bool ViewBlobInternalsJob::IsRedirectResponse(GURL* location,
                                               int* http_status_code) {
   if (request_->url().has_query()) {
     // Strip the query parameters.
     GURL::Replacements replacements;
     replacements.ClearQuery();
     *location = request_->url().ReplaceComponents(replacements);
     *http_status_code = 307;
     return true;
   }
   return false;
 }
 
+void ViewBlobInternalsJob::Kill() {
+  URLRequestSimpleJob::Kill();
+  method_factory_.RevokeAll();
+}
+
 void ViewBlobInternalsJob::DoWorkAsync() {
   if (request_->url().has_query() &&
       StartsWithASCII(request_->url().query(), "remove=", true)) {
     std::string blob_url = request_->url().query().substr(strlen("remove="));
     blob_url = UnescapeURLComponent(blob_url,
         UnescapeRule::NORMAL | UnescapeRule::URL_SPECIAL_CHARS);
     blob_storage_controller_->UnregisterBlobUrl(GURL(blob_url));
   }
 
   StartAsync();
@@ skipping 83 matching lines @@
     }
 
     if (has_multi_items)
       EndHTMLList(out);
   }
 
   EndHTMLList(out);
 }
 
 }  // namespace webkit_blob