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

chrome/browser/renderer_host/safe_browsing_resource_handler.cc

Index: chrome/browser/renderer_host/safe_browsing_resource_handler.cc
===================================================================
--- chrome/browser/renderer_host/safe_browsing_resource_handler.cc	(revision 40318)
+++ chrome/browser/renderer_host/safe_browsing_resource_handler.cc	(working copy)
@@ -90,7 +90,7 @@
   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,
@@ -147,7 +147,8 @@
     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;