Permission Action Reporting: Add num_prior_* fields.

chrome/browser/safe_browsing/permission_reporter.cc

 // 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.
 
 #include "chrome/browser/safe_browsing/permission_reporter.h"
 
 #include <functional>
 
 #include "base/hash.h"
 #include "base/memory/ptr_util.h"
@@ skipping 132 matching lines @@
     std::unique_ptr<base::Clock> clock)
     : permission_report_sender_(std::move(report_sender)),
       clock_(std::move(clock)) {}
 
 PermissionReporter::~PermissionReporter() {}
 
 void PermissionReporter::SendReport(const GURL& origin,
                                     content::PermissionType permission,
                                     PermissionAction action,
                                     PermissionSourceUI source_ui,
-                                    PermissionRequestGestureType gesture_type) {
+                                    PermissionRequestGestureType gesture_type,
+                                    int num_prior_dismissals,
+                                    int num_prior_ignores) {
   if (IsReportThresholdExceeded(permission, origin))
     return;
   std::string serialized_report;
   BuildReport(origin, permission, action, source_ui, gesture_type,
-              &serialized_report);
+              num_prior_dismissals, num_prior_ignores, &serialized_report);
   permission_report_sender_->Send(GURL(kPermissionActionReportingUploadUrl),
                                   serialized_report);
 }
 
 // static
 bool PermissionReporter::BuildReport(const GURL& origin,
                                      PermissionType permission,
                                      PermissionAction action,
                                      PermissionSourceUI source_ui,
                                      PermissionRequestGestureType gesture_type,
+                                     int num_prior_dismissals,
+                                     int num_prior_ignores,
                                      std::string* output) {
   PermissionReport report;
   report.set_origin(origin.spec());
   report.set_permission(PermissionTypeForReport(permission));
   report.set_action(PermissionActionForReport(action));
   report.set_source_ui(SourceUIForReport(source_ui));
   report.set_gesture(GestureTypeForReport(gesture_type));
+  report.set_num_prior_dismissals(num_prior_dismissals);
+  report.set_num_prior_ignores(num_prior_ignores);
 
   // Collect platform data.
 #if defined(OS_ANDROID)
   report.set_platform_type(PermissionReport::ANDROID_PLATFORM);
 #elif defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_CHROMEOS) || \
     defined(OS_LINUX)
   report.set_platform_type(PermissionReport::DESKTOP_PLATFORM);
 #else
 #error Unsupported platform.
 #endif
@@ skipping 21 matching lines @@
   }
   if (log.size() < kMaximumReportsPerOriginPerPermissionPerMinute) {
     log.push(current_time);
     return false;
   } else {
     return true;
   }
 }
 
 }  // namespace safe_browsing