Replace incident type handlers with implementations of Incident.

chrome/chrome_browser.gypi

 # Copyright 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.
 
 {
   'variables': {
     # All .cc, .h, .m, and .mm files under browser except for:
     # * tests and mocks.
     # * code below browser/chromeos
     # * code below browser/extensions
@@ skipping 2279 matching lines @@
       '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/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/binary_integrity_incident.cc',
+      'browser/safe_browsing/incident_reporting/binary_integrity_incident.h',
       'browser/safe_browsing/incident_reporting/blacklist_load_analyzer.cc',
       'browser/safe_browsing/incident_reporting/blacklist_load_analyzer.h',
       'browser/safe_browsing/incident_reporting/blacklist_load_analyzer_win.cc',
-      'browser/safe_browsing/incident_reporting/blacklist_load_incident_handlers.cc',
-      'browser/safe_browsing/incident_reporting/blacklist_load_incident_handlers.h',
+      'browser/safe_browsing/incident_reporting/blacklist_load_incident.cc',
+      'browser/safe_browsing/incident_reporting/blacklist_load_incident.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/download_metadata_manager.cc',
       'browser/safe_browsing/incident_reporting/download_metadata_manager.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.cc',
+      'browser/safe_browsing/incident_reporting/incident.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_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/incident_reporting_service.cc',
       'browser/safe_browsing/incident_reporting/incident_reporting_service.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/off_domain_inclusion_detector.cc',
       'browser/safe_browsing/incident_reporting/off_domain_inclusion_detector.h',
-      'browser/safe_browsing/incident_reporting/omnibox_incident_handlers.cc',
-      'browser/safe_browsing/incident_reporting/omnibox_incident_handlers.h',
+      'browser/safe_browsing/incident_reporting/omnibox_interaction_incident.cc',
+      'browser/safe_browsing/incident_reporting/omnibox_interaction_incident.h',
       'browser/safe_browsing/incident_reporting/omnibox_watcher.cc',
       'browser/safe_browsing/incident_reporting/omnibox_watcher.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/incident_reporting/tracked_preference_incident.cc',
+      'browser/safe_browsing/incident_reporting/tracked_preference_incident.h',
       'browser/safe_browsing/incident_reporting/variations_seed_signature_analyzer.cc',
       'browser/safe_browsing/incident_reporting/variations_seed_signature_analyzer.h',
-      'browser/safe_browsing/incident_reporting/variations_seed_signature_incident_handlers.cc',
-      'browser/safe_browsing/incident_reporting/variations_seed_signature_incident_handlers.h',
+      'browser/safe_browsing/incident_reporting/variations_seed_signature_incident.cc',
+      'browser/safe_browsing/incident_reporting/variations_seed_signature_incident.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/prefix_set.cc',
       'browser/safe_browsing/prefix_set.h',
       'browser/safe_browsing/protocol_manager.cc',
       'browser/safe_browsing/protocol_manager.h',
       'browser/safe_browsing/protocol_parser.cc',
       'browser/safe_browsing/protocol_parser.h',
@@ skipping 1361 matching lines @@
           'variables': {
             'proto_in_dir': 'browser/sync_file_system/drive_backend',
             'proto_out_dir': 'chrome/browser/sync_file_system/drive_backend',
           },
           'includes': [ '../build/protoc.gypi' ]
         },
       ],
     },],
   ],
 }