Merge 40426 - Fix a CHECK() being hit when the safebrowsing check times out (...

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 40435)
+++ 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_
+                              << " but got: " << url;
 
   timer_.Stop();  // Cancel the timeout timer.
   safe_browsing_result_ = result;