Revert of Add CHECKs to investigate ResourceThrottle crash.

content/browser/loader/throttling_resource_handler.cc

 // Copyright (c) 2012 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/throttling_resource_handler.h"
 
 #include <utility>
 
-#include "base/debug/alias.h"
-#include "base/strings/string_util.h"
 #include "content/browser/loader/resource_request_info_impl.h"
 #include "content/public/browser/resource_throttle.h"
 #include "content/public/common/resource_response.h"
 #include "net/url_request/url_request.h"
 
 namespace content {
 
 ThrottlingResourceHandler::ThrottlingResourceHandler(
     std::unique_ptr<ResourceHandler> next_handler,
     net::URLRequest* request,
     ScopedVector<ResourceThrottle> throttles)
     : LayeredResourceHandler(request, std::move(next_handler)),
       deferred_stage_(DEFERRED_NONE),
       throttles_(std::move(throttles)),
       next_index_(0),
-      cancelled_by_resource_throttle_(false),
-      currently_calling_throttle_(false) {
+      cancelled_by_resource_throttle_(false) {
   for (size_t i = 0; i < throttles_.size(); ++i) {
     throttles_[i]->set_controller(this);
     // Throttles must have a name, as otherwise, bugs where a throttle fails
     // to resume a request can be very difficult to debug.
     DCHECK(throttles_[i]->GetNameForLogging());
   }
 }
 
 ThrottlingResourceHandler::~ThrottlingResourceHandler() {
-  // Check if |this| is being destroyed in a reentrant call from a throttle.
-  if (currently_calling_throttle_) {
-    CHECK_LE(1u, next_index_);
-    CHECK_LE(next_index_, throttles_.size());
-
-    // Stick some information on the stack that may be useful in debugging.
-    char bad_throttle_name[100];
-    base::strlcpy(bad_throttle_name,
-                  throttles_[next_index_ - 1]->GetNameForLogging(),
-                  arraysize(bad_throttle_name));
-    DeferredStage deferred_stage = deferred_stage_;
-    char url[128];
-    // The request should still be valid at this point...
-    base::strlcpy(url, request()->url().spec().c_str(), arraysize(url));
-    base::debug::Alias(bad_throttle_name);
-    base::debug::Alias(&deferred_stage);
-    base::debug::Alias(url);
-
-    CHECK(false);
-  }
 }
 
 bool ThrottlingResourceHandler::OnRequestRedirected(
     const net::RedirectInfo& redirect_info,
     ResourceResponse* response,
     bool* defer) {
-  CHECK(!currently_calling_throttle_);
   DCHECK(!cancelled_by_resource_throttle_);
 
   *defer = false;
   while (next_index_ < throttles_.size()) {
     int index = next_index_;
-    currently_calling_throttle_ = true;
     throttles_[index]->WillRedirectRequest(redirect_info, defer);
-    currently_calling_throttle_ = false;
     next_index_++;
     if (cancelled_by_resource_throttle_)
       return false;
     if (*defer) {
       OnRequestDefered(index);
       deferred_stage_ = DEFERRED_REDIRECT;
       deferred_redirect_ = redirect_info;
       deferred_response_ = response;
       return true;  // Do not cancel.
     }
   }
 
   next_index_ = 0;  // Reset for next time.
 
   return next_handler_->OnRequestRedirected(redirect_info, response, defer);
 }
 
 bool ThrottlingResourceHandler::OnWillStart(const GURL& url, bool* defer) {
-  CHECK(!currently_calling_throttle_);
   DCHECK(!cancelled_by_resource_throttle_);
 
   *defer = false;
   while (next_index_ < throttles_.size()) {
     int index = next_index_;
-    currently_calling_throttle_ = true;
     throttles_[index]->WillStartRequest(defer);
-    currently_calling_throttle_ = false;
     next_index_++;
     if (cancelled_by_resource_throttle_)
       return false;
     if (*defer) {
       OnRequestDefered(index);
       deferred_stage_ = DEFERRED_START;
       deferred_url_ = url;
       return true;  // Do not cancel.
     }
   }
 
   next_index_ = 0;  // Reset for next time.
 
   return next_handler_->OnWillStart(url, defer);
 }
 
 bool ThrottlingResourceHandler::OnResponseStarted(ResourceResponse* response,
                                                   bool* defer) {
-  CHECK(!currently_calling_throttle_);
   DCHECK(!cancelled_by_resource_throttle_);
 
   while (next_index_ < throttles_.size()) {
     int index = next_index_;
-    currently_calling_throttle_ = true;
     throttles_[index]->WillProcessResponse(defer);
-    currently_calling_throttle_ = false;
     next_index_++;
     if (cancelled_by_resource_throttle_)
       return false;
     if (*defer) {
       OnRequestDefered(index);
       deferred_stage_ = DEFERRED_RESPONSE;
       deferred_response_ = response;
       return true;  // Do not cancel.
     }
   }
@@ skipping 12 matching lines @@
   cancelled_by_resource_throttle_ = true;
   controller()->CancelAndIgnore();
 }
 
 void ThrottlingResourceHandler::CancelWithError(int error_code) {
   cancelled_by_resource_throttle_ = true;
   controller()->CancelWithError(error_code);
 }
 
 void ThrottlingResourceHandler::Resume() {
-  CHECK(!currently_calling_throttle_);
   DCHECK(!cancelled_by_resource_throttle_);
-  // TODO(mmenke):  Remove CHECK once https://crbug.com/640545 is resolved, as
-  // it's redundant with the NOTREACHED() below.
-  CHECK_NE(DEFERRED_NONE, deferred_stage_);
 
   DeferredStage last_deferred_stage = deferred_stage_;
   deferred_stage_ = DEFERRED_NONE;
   // Clear information about the throttle that delayed the request.
   request()->LogUnblocked();
   switch (last_deferred_stage) {
     case DEFERRED_NONE:
       NOTREACHED();
       break;
     case DEFERRED_START:
       ResumeStart();
       break;
     case DEFERRED_REDIRECT:
       ResumeRedirect();
       break;
     case DEFERRED_RESPONSE:
       ResumeResponse();
       break;
   }
 }
 
 void ThrottlingResourceHandler::ResumeStart() {
-  CHECK(!currently_calling_throttle_);
   DCHECK(!cancelled_by_resource_throttle_);
 
   GURL url = deferred_url_;
   deferred_url_ = GURL();
 
   bool defer = false;
   if (!OnWillStart(url, &defer)) {
     controller()->Cancel();
   } else if (!defer) {
     controller()->Resume();
   }
 }
 
 void ThrottlingResourceHandler::ResumeRedirect() {
-  CHECK(!currently_calling_throttle_);
   DCHECK(!cancelled_by_resource_throttle_);
 
   net::RedirectInfo redirect_info = deferred_redirect_;
   deferred_redirect_ = net::RedirectInfo();
   scoped_refptr<ResourceResponse> response;
   deferred_response_.swap(response);
 
   bool defer = false;
   if (!OnRequestRedirected(redirect_info, response.get(), &defer)) {
     controller()->Cancel();
   } else if (!defer) {
     controller()->Resume();
   }
 }
 
 void ThrottlingResourceHandler::ResumeResponse() {
-  CHECK(!currently_calling_throttle_);
   DCHECK(!cancelled_by_resource_throttle_);
 
   scoped_refptr<ResourceResponse> response;
   deferred_response_.swap(response);
 
   bool defer = false;
   if (!OnResponseStarted(response.get(), &defer)) {
     controller()->Cancel();
   } else if (!defer) {
     controller()->Resume();
   }
 }
 
 void ThrottlingResourceHandler::OnRequestDefered(int throttle_index) {
   request()->LogBlockedBy(throttles_[throttle_index]->GetNameForLogging());
 }
 
 }  // namespace content