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

chrome/browser/safe_browsing/protocol_manager.h

 // 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.
 
 #ifndef CHROME_BROWSER_SAFE_BROWSING_PROTOCOL_MANAGER_H_
 #define CHROME_BROWSER_SAFE_BROWSING_PROTOCOL_MANAGER_H_
 
 // A class that implements Chrome's interface with the SafeBrowsing protocol.
 // See https://developers.google.com/safe-browsing/developers_guide_v2 for
 // protocol details.
@@ skipping 13 matching lines @@
 
 #include "base/containers/hash_tables.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/safe_browsing/chunk_range.h"
 #include "chrome/browser/safe_browsing/protocol_manager_helper.h"
 #include "chrome/browser/safe_browsing/protocol_parser.h"
 #include "chrome/browser/safe_browsing/safe_browsing_util.h"
+#include "components/safe_browsing_db/safe_browsing_prefs.h"
 #include "components/safe_browsing_db/safebrowsing.pb.h"
 #include "components/safe_browsing_db/util.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_status.h"
 #include "url/gurl.h"
 
 namespace net {
 class URLFetcher;
 class URLRequestContextGetter;
 }  // namespace net
@@ skipping 36 matching lines @@
 
   // net::URLFetcherDelegate interface.
   void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   // Retrieve the full hash for a set of prefixes, and invoke the callback
   // argument when the results are retrieved. The callback may be invoked
   // synchronously.
   virtual void GetFullHash(const std::vector<SBPrefix>& prefixes,
                            FullHashCallback callback,
                            bool is_download,
-                           bool is_extended_reporting);
+                           ExtendedReportingLevel reporting_level);
 
   // Forces the start of next update after |interval| time.
   void ForceScheduleNextUpdate(base::TimeDelta interval);
 
   // Scheduled update callback.
   void GetNextUpdate();
 
   // Called by the SafeBrowsingService when our request for a list of all chunks
   // for each list is done.  If database_error is true, that means the protocol
   // manager shouldn't fetch updates since they can't be written to disk.  It
   // should try again later to open the database.
   void OnGetChunksComplete(const std::vector<SBListChunkRanges>& list,
                            bool database_error,
-                           bool is_extended_reporting);
+                           ExtendedReportingLevel reporting_level);
 
   // The last time we received an update.
   base::Time last_update() const { return last_update_; }
 
   // Setter for additional_query_. To make sure the additional_query_ won't
   // be changed in the middle of an update, caller (e.g.: SafeBrowsingService)
   // should call this after callbacks triggered in UpdateFinished() or before
   // IssueUpdateRequest().
   void set_additional_query(const std::string& query) {
     additional_query_ = query;
@@ skipping 89 matching lines @@
 
   // Which type of backup update request is being used.
   enum BackupUpdateReason {
     BACKUP_UPDATE_REASON_CONNECT,
     BACKUP_UPDATE_REASON_HTTP,
     BACKUP_UPDATE_REASON_NETWORK,
     BACKUP_UPDATE_REASON_MAX,
   };
 
   // Generates Update URL for querying about the latest set of chunk updates.
-  GURL UpdateUrl(bool is_extended_reporting) const;
+  GURL UpdateUrl(ExtendedReportingLevel reporting_level) const;
 
   // Generates backup Update URL for querying about the latest set of chunk
   // updates. |url_prefix| is the base prefix to use.
   GURL BackupUpdateUrl(BackupUpdateReason reason) const;
 
   // Generates GetHash request URL for retrieving full hashes.
-  GURL GetHashUrl(bool is_extended_reporting) const;
-  // Generates URL for reporting safe browsing hits for UMA users.
+  GURL GetHashUrl(ExtendedReportingLevel reporting_level) const;
 
   // Composes a ChunkUrl based on input string.
   GURL NextChunkUrl(const std::string& input) const;
 
   // Returns the time for the next update request. If |back_off| is true,
   // the time returned will increment an error count and return the appriate
   // next time (see ScheduleNextUpdate below).
   base::TimeDelta GetNextUpdateInterval(bool back_off);
 
   // Worker function for calculating GetHash and Update backoff times (in
@@ skipping 170 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(SBProtocolManagerFactory);
 };
 
 // Delegate interface for the SafeBrowsingProtocolManager.
 class SafeBrowsingProtocolManagerDelegate {
  public:
   using GetChunksCallback = base::Callback<void(
       const std::vector<SBListChunkRanges>&, /* List of chunks */
       bool,                                  /* database_error */
-      bool                                   /* is_extended_reporting */)>;
+      ExtendedReportingLevel /* reporting_level */)>;

[Jialiu Lin, 2016/11/17 18:47:23]

nit: align with the above two comments?

[lpz, 2016/11/17 19:46:05]

Done, although git cl format seems to put this back, so not sure I'll be able to
submit it that way.

   using AddChunksCallback = base::Closure;
 
   virtual ~SafeBrowsingProtocolManagerDelegate();
 
   // |UpdateStarted()| is called just before the SafeBrowsing update protocol
   // has begun.
   virtual void UpdateStarted() = 0;
 
   // |UpdateFinished()| is called just after the SafeBrowsing update protocol
   // has completed.
@@ skipping 16 matching lines @@
       AddChunksCallback callback) = 0;
 
   // Delete chunks from the database.
   virtual void DeleteChunks(
       std::unique_ptr<std::vector<SBChunkDelete>> chunk_deletes) = 0;
 };
 
 }  // namespace safe_browsing
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_PROTOCOL_MANAGER_H_