Permission Action Reporting: Add num_prior_* fields.

chrome/browser/safe_browsing/permission_reporter.h

 // Copyright 2016 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_PERMISSION_REPORTER_H_
 #define CHROME_BROWSER_SAFE_BROWSING_PERMISSION_REPORTER_H_
 
 #include <queue>
 #include <string>
 #include <unordered_map>
@@ skipping 34 matching lines @@
   // the SafeBrowsing permission action server, using |request_context| as the
   // context for the reports.
   explicit PermissionReporter(net::URLRequestContext* request_context);
 
   ~PermissionReporter();
 
   // Sends a serialized permission report to the report collection server.
   // The permission report includes |origin| as the origin of
   // the site requesting permission, |permission| as the type of permission
   // requested, |action| as the action taken, and |gesture_type| as to whether
-  // the action occurred after a user gesture. The report will be serialized
-  // using protobuf defined in
+  // the action occurred after a user gesture. It also includes
+  // |num_prior_dismissals| and |num_prior_ignores| the number of dismissals
+  // and ignores for this permission and origin that occurred prior to this
+  // report. The report will be serialized using protobuf defined in
   // //src/chrome/common/safe_browsing/permission_report.proto
   void SendReport(const GURL& origin,
                   content::PermissionType permission,
                   PermissionAction action,
                   PermissionSourceUI source_ui,
-                  PermissionRequestGestureType gesture_type);
+                  PermissionRequestGestureType gesture_type,
+                  int num_prior_dismissals,

[Nathan Parker, 2016/08/17 20:06:01]

This is getting pretty long, and consecutive same-type params are dangerous in
that it's easy to swap them accidentally.  To consider: Pass in a single struct.
 Your call.

[kcarattini, 2016/08/17 22:37:26]

Acknowledged. Added a TODO to address this in a followup cl.

+                  int num_prior_ignores);
 
  private:
   friend class PermissionReporterBrowserTest;
   friend class PermissionReporterTest;
 
   // Used by tests. This constructor allows tests to have access to the
   // ReportSender and use a test Clock.
   PermissionReporter(std::unique_ptr<net::ReportSender> report_sender,
                      std::unique_ptr<base::Clock> clock);
 
   // Builds and serializes a permission report with |origin| as the origin of
   // the site requesting permission, |permission| as the type of permission
   // requested, and |action| as the action taken. The serialized report is
   // written into |output|. Returns true if the serialization was successful and
   // false otherwise.
   static bool BuildReport(const GURL& origin,
                           content::PermissionType permission,
                           PermissionAction action,
                           PermissionSourceUI source_ui,
                           PermissionRequestGestureType gesture_type,
+                          int num_prior_dismissals,
+                          int num_prior_ignores,
                           std::string* output);
 
   // Returns false if the number of reports sent in the last one minute per
   // origin per permission is under a threshold, otherwise true.
   bool IsReportThresholdExceeded(content::PermissionType permission,
                                  const GURL& origin);
 
   std::unique_ptr<net::ReportSender> permission_report_sender_;
 
   // TODO(stefanocs): This might introduce a memory issue since older entries
   // are not removed until a new report with the corresponding key is added. We
   // should address this issue if that becomes a problem in the future.
   std::unordered_map<PermissionAndOrigin,
                      std::queue<base::Time>,
                      PermissionAndOriginHash>
       report_logs_;
 
   std::unique_ptr<base::Clock> clock_;
 
   DISALLOW_COPY_AND_ASSIGN(PermissionReporter);
 };
 
 }  // namespace safe_browsing
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_PERMISSION_REPORTER_H_