Replace incident type handlers with implementations of Incident.

chrome/chrome_tests_unit.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': {
     'chrome_unit_tests_sources': [
       '../apps/saved_files_service_unittest.cc',
       '../components/autofill/content/renderer/test_password_autofill_agent.cc',
       '../components/autofill/content/renderer/test_password_autofill_agent.h',
       '../components/autofill/content/renderer/test_password_generation_agent.cc',
@@ skipping 645 matching lines @@
       'browser/safe_browsing/binary_feature_extractor_win_unittest.cc',
       'browser/safe_browsing/browser_feature_extractor_unittest.cc',
       'browser/safe_browsing/chunk_range_unittest.cc',
       'browser/safe_browsing/client_side_detection_host_unittest.cc',
       'browser/safe_browsing/client_side_detection_service_unittest.cc',
       'browser/safe_browsing/database_manager_unittest.cc',
       'browser/safe_browsing/download_feedback_service_unittest.cc',
       'browser/safe_browsing/download_feedback_unittest.cc',
       'browser/safe_browsing/download_protection_service_unittest.cc',
       'browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win_unittest.cc',
-      'browser/safe_browsing/incident_reporting/binary_integrity_incident_handlers_unittest.cc',
+      'browser/safe_browsing/incident_reporting/binary_integrity_incident_unittest.cc',
       'browser/safe_browsing/incident_reporting/blacklist_load_analyzer_win_unittest.cc',
-      'browser/safe_browsing/incident_reporting/blacklist_load_incident_handlers_unittest.cc',
+      'browser/safe_browsing/incident_reporting/blacklist_load_incident_unittest.cc',
       'browser/safe_browsing/incident_reporting/delayed_callback_runner_unittest.cc',
       'browser/safe_browsing/incident_reporting/download_metadata_manager_unittest.cc',
       'browser/safe_browsing/incident_reporting/environment_data_collection_win_unittest.cc',
       'browser/safe_browsing/incident_reporting/incident_report_uploader_impl_unittest.cc',
       'browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc',
       'browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc',
       'browser/safe_browsing/incident_reporting/module_integrity_unittest_util_win.cc',
       'browser/safe_browsing/incident_reporting/module_integrity_unittest_util_win.h',
       'browser/safe_browsing/incident_reporting/module_integrity_verifier_win_unittest.cc',
       'browser/safe_browsing/incident_reporting/off_domain_inclusion_detector_unittest.cc',
       'browser/safe_browsing/incident_reporting/preference_validation_delegate_unittest.cc',
-      'browser/safe_browsing/incident_reporting/tracked_preference_incident_handlers_unittest.cc',
-      'browser/safe_browsing/incident_reporting/variations_seed_signature_incident_handlers_unittest.cc',
+      'browser/safe_browsing/incident_reporting/tracked_preference_incident_unittest.cc',
+      'browser/safe_browsing/incident_reporting/variations_seed_signature_incident_unittest.cc',
       'browser/safe_browsing/local_two_phase_testserver.cc',
       'browser/safe_browsing/malware_details_unittest.cc',
       'browser/safe_browsing/path_sanitizer_unittest.cc',
       'browser/safe_browsing/pe_image_reader_win_unittest.cc',
       'browser/safe_browsing/ping_manager_unittest.cc',
       'browser/safe_browsing/prefix_set_unittest.cc',
       'browser/safe_browsing/protocol_manager_unittest.cc',
       'browser/safe_browsing/protocol_parser_unittest.cc',
       'browser/safe_browsing/safe_browsing_blocking_page_unittest.cc',
       'browser/safe_browsing/safe_browsing_database_unittest.cc',
@@ skipping 2261 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }