Add support for scout to 'ext' param when creating SafeBrowsing ping URLs.

chrome/browser/safe_browsing/ping_manager_unittest.cc

 // Copyright (c) 2012 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 "base/base64.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
@@ skipping 70 matching lines @@
   HitReport base_hp;
   base_hp.malicious_url = GURL("http://malicious.url.com");
   base_hp.page_url = GURL("http://page.url.com");
   base_hp.referrer_url = GURL("http://referrer.url.com");
 
   {
     HitReport hp(base_hp);
     hp.threat_type = SB_THREAT_TYPE_URL_MALWARE;
     hp.threat_source = ThreatSource::LOCAL_PVER3;
     hp.is_subresource = true;
-    hp.is_extended_reporting = true;
+    hp.extended_reporting_level = SBER_LEVEL_LEGACY;
     hp.is_metrics_reporting_active = true;
 
     EXPECT_EQ(
         "https://prefix.com/foo/report?client=unittest&appver=1.0&"
         "pver=3.0" +
             key_param_ +
             "&ext=1&evts=malblhit&evtd=http%3A%2F%2Fmalicious.url.com%2F&"
             "evtr=http%3A%2F%2Fpage.url.com%2F&evhr=http%3A%2F%2Freferrer."
             "url.com%2F&evtb=1&src=l3&m=1",
         ping_manager()->SafeBrowsingHitUrl(hp).spec());
   }
 
   {
     HitReport hp(base_hp);
     hp.threat_type = SB_THREAT_TYPE_URL_PHISHING;
     hp.threat_source = ThreatSource::DATA_SAVER;
     hp.is_subresource = false;
-    hp.is_extended_reporting = true;
+    hp.extended_reporting_level = SBER_LEVEL_LEGACY;
     hp.is_metrics_reporting_active = true;
     EXPECT_EQ(
         "https://prefix.com/foo/report?client=unittest&appver=1.0&"
         "pver=3.0" +
             key_param_ +
             "&ext=1&evts=phishblhit&"
             "evtd=http%3A%2F%2Fmalicious.url.com%2F&"
             "evtr=http%3A%2F%2Fpage.url.com%2F&evhr=http%3A%2F%2Freferrer."
             "url.com%2F&evtb=0&src=ds&m=1",
         ping_manager()->SafeBrowsingHitUrl(hp).spec());
   }
 
   {
     HitReport hp(base_hp);
+    hp.threat_type = SB_THREAT_TYPE_URL_PHISHING;
+    hp.threat_source = ThreatSource::DATA_SAVER;
+    hp.is_subresource = false;
+    hp.extended_reporting_level = SBER_LEVEL_SCOUT;
+    hp.is_metrics_reporting_active = true;
+    EXPECT_EQ(
+        "https://prefix.com/foo/report?client=unittest&appver=1.0&"
+        "pver=3.0" +
+            key_param_ +
+            "&ext=2&evts=phishblhit&"
+            "evtd=http%3A%2F%2Fmalicious.url.com%2F&"
+            "evtr=http%3A%2F%2Fpage.url.com%2F&evhr=http%3A%2F%2Freferrer."
+            "url.com%2F&evtb=0&src=ds&m=1",
+        ping_manager()->SafeBrowsingHitUrl(hp).spec());
+  }
+
+  {
+    HitReport hp(base_hp);
     hp.threat_type = SB_THREAT_TYPE_BINARY_MALWARE_URL;
     hp.threat_source = ThreatSource::REMOTE;
-    hp.is_extended_reporting = false;
+    hp.extended_reporting_level = SBER_LEVEL_OFF;
     hp.is_metrics_reporting_active = true;
     hp.is_subresource = false;
     EXPECT_EQ(
         "https://prefix.com/foo/report?client=unittest&appver=1.0&"
         "pver=3.0" +
             key_param_ +
             "&ext=0&evts=binurlhit&"
             "evtd=http%3A%2F%2Fmalicious.url.com%2F&"
             "evtr=http%3A%2F%2Fpage.url.com%2F&evhr=http%3A%2F%2Freferrer."
             "url.com%2F&evtb=0&src=rem&m=1",
         ping_manager()->SafeBrowsingHitUrl(hp).spec());
   }
 
   {
     HitReport hp(base_hp);
     hp.threat_type = SB_THREAT_TYPE_CLIENT_SIDE_PHISHING_URL;
     hp.threat_source = ThreatSource::LOCAL_PVER4;
-    hp.is_extended_reporting = false;
+    hp.extended_reporting_level = SBER_LEVEL_OFF;
     hp.is_metrics_reporting_active = false;
     hp.is_subresource = false;
     EXPECT_EQ(
         "https://prefix.com/foo/report?client=unittest&appver=1.0&"
         "pver=3.0" +
             key_param_ +
             "&ext=0&evts=phishcsdhit&"
             "evtd=http%3A%2F%2Fmalicious.url.com%2F&"
             "evtr=http%3A%2F%2Fpage.url.com%2F&evhr=http%3A%2F%2Freferrer."
             "url.com%2F&evtb=0&src=l4&m=0",
         ping_manager()->SafeBrowsingHitUrl(hp).spec());
   }
 
   {
     HitReport hp(base_hp);
     hp.threat_type = SB_THREAT_TYPE_CLIENT_SIDE_MALWARE_URL;
     hp.threat_source = ThreatSource::LOCAL_PVER4;
-    hp.is_extended_reporting = false;
+    hp.extended_reporting_level = SBER_LEVEL_OFF;
     hp.is_metrics_reporting_active = false;
     hp.is_subresource = true;
     EXPECT_EQ(
         "https://prefix.com/foo/report?client=unittest&appver=1.0&"
         "pver=3.0" +
             key_param_ +
             "&ext=0&evts=malcsdhit&"
             "evtd=http%3A%2F%2Fmalicious.url.com%2F&"
             "evtr=http%3A%2F%2Fpage.url.com%2F&evhr=http%3A%2F%2Freferrer."
             "url.com%2F&evtb=1&src=l4&m=0",
         ping_manager()->SafeBrowsingHitUrl(hp).spec());
   }
 
   // Same as above, but add population_id
   {
     HitReport hp(base_hp);
     hp.threat_type = SB_THREAT_TYPE_CLIENT_SIDE_MALWARE_URL;
     hp.threat_source = ThreatSource::LOCAL_PVER4;
-    hp.is_extended_reporting = false;
+    hp.extended_reporting_level = SBER_LEVEL_OFF;
     hp.is_metrics_reporting_active = false;
     hp.is_subresource = true;
     hp.population_id = "foo bar";
     EXPECT_EQ(
         "https://prefix.com/foo/report?client=unittest&appver=1.0&"
         "pver=3.0" +
             key_param_ +
             "&ext=0&evts=malcsdhit&"
             "evtd=http%3A%2F%2Fmalicious.url.com%2F&"
             "evtr=http%3A%2F%2Fpage.url.com%2F&evhr=http%3A%2F%2Freferrer."
@@ skipping 67 matching lines @@
   const std::string kHitReportPostData = "Hit Report POST Data";
   std::string encoded_post_data = "";
   base::Base64Encode(kHitReportPostData, &encoded_post_data);
 
   HitReport hp;
   hp.malicious_url = GURL("http://malicious.url.com");
   hp.page_url = GURL("http://page.url.com");
   hp.referrer_url = GURL("http://referrer.url.com");
   hp.threat_type = SB_THREAT_TYPE_CLIENT_SIDE_MALWARE_URL;
   hp.threat_source = ThreatSource::LOCAL_PVER4;
-  hp.is_extended_reporting = false;
+  hp.extended_reporting_level = SBER_LEVEL_OFF;
   hp.is_metrics_reporting_active = false;
   hp.is_subresource = true;
   hp.population_id = "foo bar";
   hp.post_data = kHitReportPostData;
   std::string expected_hit_report_url = ping_manager()->SafeBrowsingHitUrl(hp)
       .spec();
   const int kRequestErrorCode = -321;
 
   // Start the report.
   ping_manager()->ReportSafeBrowsingHit(hp);
@@ skipping 83 matching lines @@
       kReportURL);
   ping_manager->ReportInvalidCertificateChain("report");
   base::RunLoop().RunUntilIdle();
 
   histograms.ExpectTotalCount(kFailureHistogramName, 1);
   histograms.ExpectBucketCount(kFailureHistogramName,
                                -net::ERR_CONNECTION_FAILED, 1);
 }
 
 }  // namespace safe_browsing