Fix a CHECK() being hit when the safebrowsing check fires.

chrome/browser/renderer_host/safe_browsing_resource_handler.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 "chrome/browser/renderer_host/safe_browsing_resource_handler.h"
 
 #include "base/logging.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
 #include "chrome/browser/renderer_host/resource_message_filter.h"
 #include "chrome/common/notification_service.h"
@@ skipping 72 matching lines @@
     int request_id, ResourceResponse* response) {
   CHECK(state_ == STATE_NONE);
   CHECK(defer_state_ == DEFERRED_NONE);
   return next_handler_->OnResponseStarted(request_id, response);
 }
 
 void SafeBrowsingResourceHandler::OnCheckUrlTimeout() {
   CHECK(state_ == STATE_CHECKING_URL);
   CHECK(defer_state_ != DEFERRED_NONE);
   safe_browsing_->CancelCheck(this);
-  OnUrlCheckResult(GURL(), SafeBrowsingService::URL_SAFE);
+  OnUrlCheckResult(deferred_url_, SafeBrowsingService::URL_SAFE);
 }
 
 bool SafeBrowsingResourceHandler::OnWillStart(int request_id,
                                               const GURL& url,
                                               bool* defer) {
   // We need to check the new URL before starting the request.
   if (CheckUrl(url))
     return next_handler_->OnWillStart(request_id, url, defer);
 
   // If the URL couldn't be verified synchronously, defer starting the
@@ skipping 36 matching lines @@
 void SafeBrowsingResourceHandler::OnRequestClosed() {
   next_handler_->OnRequestClosed();
 }
 
 // SafeBrowsingService::Client implementation, called on the IO thread once
 // the URL has been classified.
 void SafeBrowsingResourceHandler::OnUrlCheckResult(
     const GURL& url, SafeBrowsingService::UrlCheckResult result) {
   CHECK(state_ == STATE_CHECKING_URL);
   CHECK(defer_state_ != DEFERRED_NONE);
-  CHECK(url == deferred_url_);
+  CHECK(url == deferred_url_) << "Was expecting: " << deferred_url_

[wtc, 2010/03/02 21:37:08]

If the |url| argument must be equal to the |deferred_url_|
member, why do we still need the |url| argument?

[eroman, 2010/03/02 21:44:19]

The redirect bug would be failing in this method, since it had a mismatch
between what the URL was completing for and what it was waiting for. The check
is to guard against those sort of mistakes. Until this code is unit tested, I
think such checks are necessary as a minimum bar for correctness.

+                              << " but got: " << url;
 
   timer_.Stop();  // Cancel the timeout timer.
   safe_browsing_result_ = result;
   state_ = STATE_NONE;
 
   if (result == SafeBrowsingService::URL_SAFE) {
     // Log how much time the safe browsing check cost us.
     base::TimeDelta pause_delta;
     pause_delta = base::TimeTicks::Now() - url_check_start_time_;
     safe_browsing_->LogPauseDelay(pause_delta);
@@ skipping 132 matching lines @@
     rdh_->FollowDeferredRedirect(render_process_host_id_, request_id,
                                  false, GURL());
   }
 }
 
 void SafeBrowsingResourceHandler::ClearDeferredRequestInfo() {
   deferred_request_id_ = -1;
   deferred_url_ = GURL();
   deferred_redirect_response_ = NULL;
 }