Replace incident type handlers with implementations of Incident.

chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer.cc

 // Copyright 2014 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/incident_reporting/binary_integrity_analyzer.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file_util.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/safe_browsing/binary_feature_extractor.h"
+#include "chrome/browser/safe_browsing/incident_reporting/binary_integrity_incident.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/common/safe_browsing/csd.pb.h"
 
 namespace safe_browsing {
 
 namespace {
 
 void RecordSignatureVerificationTime(size_t file_index,
     const base::TimeDelta& verification_time) {
   static const char kHistogramName[] = "SBIRS.VerifyBinaryIntegrity.";
@@ skipping 33 matching lines @@
 
     scoped_ptr<ClientDownloadRequest_SignatureInfo> signature_info(
         new ClientDownloadRequest_SignatureInfo());
 
     base::TimeTicks time_before = base::TimeTicks::Now();
     binary_feature_extractor->CheckSignature(binary_path, signature_info.get());
     RecordSignatureVerificationTime(i, base::TimeTicks::Now() - time_before);
 
     // Only create a report if the signature is untrusted.
     if (!signature_info->trusted()) {
-      scoped_ptr<ClientIncidentReport_IncidentData> incident_data(
-          new ClientIncidentReport_IncidentData());
-      ClientIncidentReport_IncidentData_BinaryIntegrityIncident*
-          binary_integrity = incident_data->mutable_binary_integrity();
+      scoped_ptr<ClientIncidentReport_IncidentData_BinaryIntegrityIncident>
+          incident(
+              new ClientIncidentReport_IncidentData_BinaryIntegrityIncident());
 
-      binary_integrity->set_file_basename(
-          binary_path.BaseName().AsUTF8Unsafe());
-      binary_integrity->set_allocated_signature(signature_info.release());
+      incident->set_file_basename(binary_path.BaseName().AsUTF8Unsafe());
+      incident->set_allocated_signature(signature_info.release());
 
       // Send the report.
-      callback.Run(incident_data.Pass());
+      callback.Run(make_scoped_ptr(
+          new BinaryIntegrityIncident(incident.Pass())));
     }
   }
 }
 
 #if !defined(OS_WIN)
 std::vector<base::FilePath> GetCriticalBinariesPath() {
   return std::vector<base::FilePath>();
 }
 #endif  // !defined(OS_WIN)
 
 }  // namespace safe_browsing