Send back the URL that matched the SafeBrowsing list with the CSD ping.

chrome/browser/safe_browsing/browser_feature_extractor.cc

 // Copyright (c) 2011 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/safe_browsing/browser_feature_extractor.h"
 
 #include <map>
 #include <utility>
 
 #include "base/stl_util.h"
@@ skipping 25 matching lines @@
 const char kFirstHttpsHostVisitMoreThan24hAgo[] =
     "FirstHttpsHostVisitMoreThan24hAgo";
 
 const char kHostPrefix[] = "Host";
 const char kRedirectPrefix[] = "Redirect";
 const char kReferrer[] = "Referrer";
 const char kHasSSLReferrer[] = "HasSSLReferrer";
 const char kPageTransitionType[] = "PageTransitionType";
 const char kIsFirstNavigation[] = "IsFirstNavigation";
 const char kBadIpFetch[] = "BadIpFetch=";
+const char kSafeBrowsingMaliciousUrl[] = "SafeBrowsingMaliciousUrl=";
+const char kSafeBrowsingOriginalUrl[] = "SafeBrowsingOriginalUrl=";
+const char kSafeBrowsingIsSubresource[] = "SafeBrowsingIsSubresource";
+const char kSafeBrowsingThreatType[] = "SafeBrowsingThreatType";
 }  // namespace features
 
 BrowseInfo::BrowseInfo() {}
 
 BrowseInfo::~BrowseInfo() {}
 
 static void AddFeature(const std::string& feature_name,
                        double feature_value,
                        ClientPhishingRequest* request) {
   DCHECK(request);
@@ skipping 163 matching lines @@
     const BrowseInfo& info,
     ClientPhishingRequest* request) {
   if (service_) {
     for (std::set<std::string>::const_iterator it = info.ips.begin();
          it != info.ips.end(); ++it) {
       if (service_->IsBadIpAddress(*it)) {
         AddFeature(features::kBadIpFetch + *it, 1.0, request);
       }
     }
   }
+  if (info.unsafe_resource.get()) {
+    // A SafeBrowsing interstitial was shown for the current URL.
+    AddFeature(features::kSafeBrowsingMaliciousUrl +
+               info.unsafe_resource->url.spec(),
+               1.0,
+               request);
+    AddFeature(features::kSafeBrowsingOriginalUrl +
+               info.unsafe_resource->original_url.spec(),
+               1.0,
+               request);
+    AddFeature(features::kSafeBrowsingIsSubresource,
+               info.unsafe_resource->is_subresource ? 1.0 : 0.0,
+               request);
+    AddFeature(features::kSafeBrowsingThreatType,
+               static_cast<double>(info.unsafe_resource->threat_type),
+               request);
+  }
+
 }
 
 void BrowserFeatureExtractor::StartExtractFeatures(
     ClientPhishingRequest* request,
     DoneCallback* callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   ExtractionData extraction = std::make_pair(request, callback);
   size_t removed = pending_extractions_.erase(extraction);
   DCHECK_EQ(1U, removed);
   HistoryService* history;
@@ skipping 196 matching lines @@
     *history = profile->GetHistoryService(Profile::EXPLICIT_ACCESS);
     if (*history) {
       return true;
     }
   }
   VLOG(2) << "Unable to query history.  No history service available.";
   return false;
 }
 
 };  // namespace safe_browsing