Fix a DCHECK triggered by DetachableResourceLoader

content/browser/loader/detachable_resource_handler.cc

 // Copyright 2013 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 "content/browser/loader/detachable_resource_handler.h"
 
 #include "base/logging.h"
 #include "base/time/time.h"
 #include "content/browser/loader/resource_request_info_impl.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
+#include "net/url_request/url_request.h"
 #include "net/url_request/url_request_status.h"
 
 namespace {
 // This matches the maximum allocation size of AsyncResourceHandler.
 const int kReadBufSize = 32 * 1024;
 }
 
 namespace content {
 
 DetachableResourceHandler::DetachableResourceHandler(
@@ skipping 40 matching lines @@
   next_handler_.reset();
 
   // Time the request out if it takes too long.
   detached_timer_.reset(new base::OneShotTimer<DetachableResourceHandler>());
   detached_timer_->Start(
       FROM_HERE, cancel_delay_, this, &DetachableResourceHandler::Cancel);
 
   // Resume if necessary. The request may have been deferred, say, waiting on a
   // full buffer in AsyncResourceHandler. Now that it has been detached, resume
   // and drain it.
-  if (is_deferred_)
+  if (is_deferred_) {
+    // The nested ResourceHandler may have logged that it's blocking the
+    // request.  Log it as no longer doing so, to avoid a DCHECK on resume.
+    request()->LogUnblocked();
     Resume();
+  }
 }
 
 void DetachableResourceHandler::SetController(ResourceController* controller) {
   ResourceHandler::SetController(controller);
 
   // Intercept the ResourceController for downstream handlers to keep track of
   // whether the request is deferred.
   if (next_handler_)
     next_handler_->SetController(this);
 }
@@ skipping 119 matching lines @@
 
 void DetachableResourceHandler::CancelAndIgnore() {
   controller()->CancelAndIgnore();
 }
 
 void DetachableResourceHandler::CancelWithError(int error_code) {
   controller()->CancelWithError(error_code);
 }
 
 }  // namespace content