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

chrome/browser/safe_browsing/ui_manager.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 "chrome/browser/safe_browsing/ui_manager.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/debug/leak_tracker.h"
@@ skipping 291 matching lines @@
     // with page_url.
     if (!resource.is_subresource &&
         !resource.original_url.is_empty() &&
         resource.original_url != resource.url) {
       hit_report.referrer_url = hit_report.page_url;
       hit_report.page_url = resource.original_url;
     }
 
     Profile* profile =
         Profile::FromBrowserContext(web_contents->GetBrowserContext());
-    hit_report.is_extended_reporting =
-        profile && IsExtendedReportingEnabled(*profile->GetPrefs());
+    hit_report.extended_reporting_level =
+        profile ? GetExtendedReportingLevel(*profile->GetPrefs())
+                : SBER_LEVEL_OFF;
     hit_report.is_metrics_reporting_active =
         ChromeMetricsServiceAccessor::IsMetricsAndCrashReportingEnabled();
 
     MaybeReportSafeBrowsingHit(hit_report);
   }
 
   if (resource.threat_type != SB_THREAT_TYPE_SAFE) {
     for (Observer& observer : observer_list_)
       observer.OnSafeBrowsingHit(resource);
   }
   AddToWhitelistUrlSet(GetMainFrameWhitelistUrlForResource(resource),
                        resource.web_contents_getter.Run(),
                        true /* A decision is now pending */,
                        resource.threat_type);
   SafeBrowsingBlockingPage::ShowBlockingPage(this, resource);
 }
 
 // A safebrowsing hit is sent after a blocking page for malware/phishing
 // or after the warning dialog for download urls, only for
 // UMA || extended_reporting users.
 void SafeBrowsingUIManager::MaybeReportSafeBrowsingHit(
     const HitReport& hit_report) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // Send report if user opted-in extended reporting.
-  if (hit_report.is_extended_reporting) {
+  if (hit_report.extended_reporting_level != SBER_LEVEL_OFF) {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&SafeBrowsingUIManager::ReportSafeBrowsingHitOnIOThread,
                    this, hit_report));
   }
 }
 
 void SafeBrowsingUIManager::ReportSafeBrowsingHitOnIOThread(
     const HitReport& hit_report) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
@@ skipping 192 matching lines @@
   }
 }
 
 // Static.
 GURL SafeBrowsingUIManager::GetMainFrameWhitelistUrlForResourceForTesting(
     const safe_browsing::SafeBrowsingUIManager::UnsafeResource& resource) {
   return GetMainFrameWhitelistUrlForResource(resource);
 }
 
 }  // namespace safe_browsing