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

chrome/browser/safe_browsing/local_database_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/local_database_manager.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/bind.h"
@@ skipping 858 matching lines @@
   } else {
     // We may have cached results for previous GetHash queries.  Since
     // this data comes from cache, don't histogram hits.
     HandleOneCheck(check, check->cache_hits);
   }
 }
 
 void LocalSafeBrowsingDatabaseManager::OnRequestFullHash(
     SafeBrowsingCheck* check) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  check->is_extended_reporting = GetExtendedReporting();
+  check->extended_reporting_level = GetExtendedReporting();
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&LocalSafeBrowsingDatabaseManager::RequestFullHash, this,
                  check));
 }
 
-bool LocalSafeBrowsingDatabaseManager::GetExtendedReporting() {
+ExtendedReportingLevel
+LocalSafeBrowsingDatabaseManager::GetExtendedReporting() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // Determine if the last used profile is opted into extended reporting.
   // Note: It is possible that the last used profile is not the one triggers
   // the hash request, but not very likely.
-  bool is_extended_reporting = false;
+  ExtendedReportingLevel extended_reporting_level = SBER_LEVEL_OFF;
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   if (profile_manager) {
     Profile* profile = profile_manager->GetLastUsedProfile();
-    is_extended_reporting =
-        profile && IsExtendedReportingEnabled(*profile->GetPrefs());
+    extended_reporting_level =
+        profile ? GetExtendedReportingLevel(*profile->GetPrefs())
+                : SBER_LEVEL_OFF;
   }
-  return is_extended_reporting;
+  return extended_reporting_level;
 }
 
 void LocalSafeBrowsingDatabaseManager::RequestFullHash(
     SafeBrowsingCheck* check) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   if (!enabled_)
     return;
 
   bool is_download = check->check_type == BINURL;
   sb_service_->protocol_manager()->GetFullHash(
       check->prefix_hits,
       base::Bind(&LocalSafeBrowsingDatabaseManager::HandleGetHashResults,
                  base::Unretained(this), check),
-      is_download, check->is_extended_reporting);
+      is_download, check->extended_reporting_level);
 }
 
 void LocalSafeBrowsingDatabaseManager::GetAllChunksFromDatabase(
     GetChunksCallback callback) {
   DCHECK(safe_browsing_task_runner_->RunsTasksOnCurrentThread());
 
   bool database_error = true;
   std::vector<SBListChunkRanges> lists;
   DCHECK(!database_update_in_progress_);
   database_update_in_progress_ = true;
@@ skipping 10 matching lines @@
           &LocalSafeBrowsingDatabaseManager::BeforeGetAllChunksFromDatabase,
           this, lists, database_error, callback));
 }
 
 void LocalSafeBrowsingDatabaseManager::BeforeGetAllChunksFromDatabase(
     const std::vector<SBListChunkRanges>& lists,
     bool database_error,
     GetChunksCallback callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-  bool is_extended_reporting = GetExtendedReporting();
+  ExtendedReportingLevel extended_reporting_level = GetExtendedReporting();
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&LocalSafeBrowsingDatabaseManager::OnGetAllChunksFromDatabase,
-                 this, lists, database_error, is_extended_reporting, callback));
+                 this, lists, database_error, extended_reporting_level,
+                 callback));
 }
 
 void LocalSafeBrowsingDatabaseManager::OnGetAllChunksFromDatabase(
     const std::vector<SBListChunkRanges>& lists,
     bool database_error,
-    bool is_extended_reporting,
+    ExtendedReportingLevel reporting_level,
     GetChunksCallback callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (enabled_)
-    callback.Run(lists, database_error, is_extended_reporting);
+    callback.Run(lists, database_error, reporting_level);
 }
 
 void LocalSafeBrowsingDatabaseManager::OnAddChunksComplete(
     AddChunksCallback callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (enabled_)
     callback.Run();
 }
 
 void LocalSafeBrowsingDatabaseManager::DatabaseLoadComplete() {
@@ skipping 268 matching lines @@
       base::Bind(&LocalSafeBrowsingDatabaseManager::TimeoutCallback,
                  check_ptr->weak_ptr_factory_->GetWeakPtr(), check_ptr),
       check_timeout_);
 }
 
 bool LocalSafeBrowsingDatabaseManager::IsDownloadProtectionEnabled() const {
   return enable_download_protection_;
 }
 
 }  // namespace safe_browsing