Fix the tracking events for CheckUrl

Bug: 1004470

Change-Id: Iddc66a93a9102b4b514dbb7236846c22ce3d5e76
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2062718
Auto-Submit: Varun Khaneja <vakh@chromium.org>
Commit-Queue: Bettina Dea <bdea@chromium.org>
Reviewed-by: Bettina Dea <bdea@chromium.org>
Cr-Commit-Position: refs/heads/master@{#742731}

components/safe_browsing/core/browser/safe_browsing_url_checker_impl.cc

@@ -121,9 +121,9 @@ SafeBrowsingUrlCheckerImpl::~SafeBrowsingUrlCheckerImpl() {
 
   if (state_ == STATE_CHECKING_URL) {
     database_manager_->CancelCheck(this);
-
-    TRACE_EVENT_ASYNC_END1("safe_browsing", "CheckUrl", this, "result",
-                           "request_canceled");
+    const GURL& url = urls_[next_index_].url;
+    TRACE_EVENT_ASYNC_END1("safe_browsing", "CheckUrl", this, "url",
+                           url.spec());
   }
 }
 
@@ -156,9 +156,7 @@ void SafeBrowsingUrlCheckerImpl::OnUrlResult(const GURL& url,
   timer_.Stop();
   RecordCheckUrlTimeout(/*timed_out=*/false);
 
-  TRACE_EVENT_ASYNC_END1(
-      "safe_browsing", "CheckUrl", this, "result",
-      threat_type == SB_THREAT_TYPE_SAFE ? "safe" : "unsafe");
+  TRACE_EVENT_ASYNC_END1("safe_browsing", "CheckUrl", this, "url", url.spec());
 
   if (threat_type == SB_THREAT_TYPE_SAFE ||
       threat_type == SB_THREAT_TYPE_SUSPICIOUS_SITE) {
@@ -348,6 +346,9 @@ void SafeBrowsingUrlCheckerImpl::ProcessUrls() {
       timer_.Stop();
       RecordCheckUrlTimeout(/*timed_out=*/false);
 
+      TRACE_EVENT_ASYNC_END1("safe_browsing", "CheckUrl", this, "url",
+                             url.spec());
+
       if (!RunNextCallback(true, false))
         return;