[M56] Add debug aliases for state_ and urls to debug CHECK failures

chrome/browser/loader/safe_browsing_resource_throttle.cc

Index: chrome/browser/loader/safe_browsing_resource_throttle.cc
diff --git a/chrome/browser/loader/safe_browsing_resource_throttle.cc b/chrome/browser/loader/safe_browsing_resource_throttle.cc
index 23a27088ef4fe9f2a774c7f7516457b8d5fddca2..1167a31df2658b728aa854aedbfd49ca07c54712 100644
--- a/chrome/browser/loader/safe_browsing_resource_throttle.cc
+++ b/chrome/browser/loader/safe_browsing_resource_throttle.cc
@@ -7,6 +7,7 @@
 #include <iterator>
 #include <utility>
 
+#include "base/debug/alias.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/trace_event/trace_event.h"
@@ -233,9 +234,17 @@ void SafeBrowsingResourceThrottle::OnCheckBrowseUrlResult(
     safe_browsing::SBThreatType threat_type,
     const safe_browsing::ThreatMetadata& metadata) {
   CHECK_EQ(state_, STATE_CHECKING_URL);
+  // TODO(vakh): The following base::debug::Alias() and CHECK calls should be
+  // removed after http://crbug.com/660293 is fixed.
   CHECK(url.is_valid());
   CHECK(url_being_checked_.is_valid());
-  CHECK_EQ(url, url_being_checked_);
+  if (url != url_being_checked_) {
+    char buf[2000];
+    snprintf(buf, sizeof(buf), "sbtr::ocbur:%s -- %s\n", url.spec().c_str(),
+             url_being_checked_.spec().c_str());
+    base::debug::Alias(buf);
+    CHECK(false) << "buf: " << buf;

[Charlie Harrison, 2017/01/12 17:19:20]

LGTM but I thought that the "<< buf..." args to CHECK were elided in release
builds?

[vakh (use Gerrit instead), 2017/01/12 17:23:02]

You are right, they are. I thought it is best to merge as-is without making any
changes unless absolutely necessary (not necessary in this case since compiler
will do that for us).

[Charlie Harrison, 2017/01/12 17:24:26]

SGTM, just making sure :)

+  }
 
   timer_.Stop();  // Cancel the timeout timer.
   threat_type_ = threat_type;