Moving all the incident reporting stuff to a common folder

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 64d5a00b1612833dd9f36298b2dc0a75c71fec00..138508e28371062ef60232c39a5bb5c0f8bd2475 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2631,15 +2631,9 @@
       'browser/download/download_completion_blocker.h',
       'browser/renderer_host/safe_browsing_resource_throttle.cc',
       'browser/renderer_host/safe_browsing_resource_throttle.h',
-      'browser/safe_browsing/add_incident_callback.h',
       'browser/safe_browsing/binary_feature_extractor.h',
       'browser/safe_browsing/binary_feature_extractor_posix.cc',
       'browser/safe_browsing/binary_feature_extractor_win.cc',
-      'browser/safe_browsing/binary_integrity_analyzer.cc',
-      'browser/safe_browsing/binary_integrity_analyzer.h',
-      'browser/safe_browsing/binary_integrity_analyzer_win.cc',
-      'browser/safe_browsing/binary_integrity_incident_handlers.cc',
-      'browser/safe_browsing/binary_integrity_incident_handlers.h',
       'browser/safe_browsing/browser_feature_extractor.cc',
       'browser/safe_browsing/browser_feature_extractor.h',
       'browser/safe_browsing/browser_features.cc',
@@ -2652,37 +2646,45 @@
       'browser/safe_browsing/client_side_detection_service.h',
       'browser/safe_browsing/database_manager.cc',
       'browser/safe_browsing/database_manager.h',
-      'browser/safe_browsing/delayed_analysis_callback.h',
-      'browser/safe_browsing/delayed_callback_runner.cc',
-      'browser/safe_browsing/delayed_callback_runner.h',
       'browser/safe_browsing/download_feedback.cc',
       'browser/safe_browsing/download_feedback.h',
       'browser/safe_browsing/download_feedback_service.cc',
       'browser/safe_browsing/download_feedback_service.h',
       'browser/safe_browsing/download_protection_service.cc',
       'browser/safe_browsing/download_protection_service.h',
-      'browser/safe_browsing/environment_data_collection.cc',
-      'browser/safe_browsing/environment_data_collection.h',
-      'browser/safe_browsing/environment_data_collection_win.cc',
-      'browser/safe_browsing/environment_data_collection_win.h',
-      'browser/safe_browsing/incident_handler_util.cc',
-      'browser/safe_browsing/incident_handler_util.h',
-      'browser/safe_browsing/incident_reporting_service.cc',
-      'browser/safe_browsing/incident_reporting_service.h',
-      'browser/safe_browsing/incident_report_uploader.cc',
-      'browser/safe_browsing/incident_report_uploader.h',
-      'browser/safe_browsing/incident_report_uploader_impl.cc',
-      'browser/safe_browsing/incident_report_uploader_impl.h',
-      'browser/safe_browsing/last_download_finder.cc',
-      'browser/safe_browsing/last_download_finder.h',
-      'browser/safe_browsing/module_integrity_verifier_win.cc',
-      'browser/safe_browsing/module_integrity_verifier_win.h',
+      'browser/safe_browsing/incident_reporting/add_incident_callback.h',
+      'browser/safe_browsing/incident_reporting/binary_integrity_analyzer.cc',
+      'browser/safe_browsing/incident_reporting/binary_integrity_analyzer.h',
+      'browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win.cc',
+      'browser/safe_browsing/incident_reporting/binary_integrity_incident_handlers.cc',
+      'browser/safe_browsing/incident_reporting/binary_integrity_incident_handlers.h',
+      'browser/safe_browsing/incident_reporting/delayed_analysis_callback.h',
+      'browser/safe_browsing/incident_reporting/delayed_callback_runner.cc',
+      'browser/safe_browsing/incident_reporting/delayed_callback_runner.h',
+      'browser/safe_browsing/incident_reporting/environment_data_collection.cc',
+      'browser/safe_browsing/incident_reporting/environment_data_collection.h',
+      'browser/safe_browsing/incident_reporting/environment_data_collection_win.cc',
+      'browser/safe_browsing/incident_reporting/environment_data_collection_win.h',
+      'browser/safe_browsing/incident_reporting/incident_handler_util.cc',
+      'browser/safe_browsing/incident_reporting/incident_handler_util.h',
+      'browser/safe_browsing/incident_reporting/incident_reporting_service.cc',
+      'browser/safe_browsing/incident_reporting/incident_reporting_service.h',
+      'browser/safe_browsing/incident_reporting/incident_report_uploader.cc',
+      'browser/safe_browsing/incident_reporting/incident_report_uploader.h',
+      'browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc',
+      'browser/safe_browsing/incident_reporting/incident_report_uploader_impl.h',
+      'browser/safe_browsing/incident_reporting/last_download_finder.cc',
+      'browser/safe_browsing/incident_reporting/last_download_finder.h',
+      'browser/safe_browsing/incident_reporting/module_integrity_verifier_win.cc',
+      'browser/safe_browsing/incident_reporting/module_integrity_verifier_win.h',
+      'browser/safe_browsing/incident_reporting/preference_validation_delegate.cc',
+      'browser/safe_browsing/incident_reporting/preference_validation_delegate.h',
+      'browser/safe_browsing/incident_reporting/tracked_preference_incident_handlers.cc',
+      'browser/safe_browsing/incident_reporting/tracked_preference_incident_handlers.h',
       'browser/safe_browsing/path_sanitizer.cc',
       'browser/safe_browsing/path_sanitizer.h',
       'browser/safe_browsing/pe_image_reader_win.cc',
       'browser/safe_browsing/pe_image_reader_win.h',
-      'browser/safe_browsing/preference_validation_delegate.cc',
-      'browser/safe_browsing/preference_validation_delegate.h',
       'browser/safe_browsing/prefix_set.cc',
       'browser/safe_browsing/prefix_set.h',
       'browser/safe_browsing/protocol_manager.cc',
@@ -2697,8 +2699,6 @@
       'browser/safe_browsing/safe_browsing_store.h',
       'browser/safe_browsing/sandboxed_zip_analyzer.cc',
       'browser/safe_browsing/sandboxed_zip_analyzer.h',
-      'browser/safe_browsing/tracked_preference_incident_handlers.cc',
-      'browser/safe_browsing/tracked_preference_incident_handlers.h',
       'browser/safe_browsing/two_phase_uploader.cc',
       'browser/safe_browsing/two_phase_uploader.h',
     ],