Implement anonymous, opt-in, collection of OS X binary integrity incidents.

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/incident_reporting/binary_integrity_incident.h"
 #include "chrome/browser/safe_browsing/incident_reporting/incident_receiver.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/common/safe_browsing/binary_feature_extractor.h"
 #include "chrome/common/safe_browsing/csd.pb.h"
 
 namespace safe_browsing {
 
-namespace {
-
 void RecordSignatureVerificationTime(size_t file_index,
-    const base::TimeDelta& verification_time) {
+                                     const base::TimeDelta& verification_time) {
   static const char kHistogramName[] = "SBIRS.VerifyBinaryIntegrity.";
 
   base::HistogramBase* signature_verification_time_histogram =
       base::Histogram::FactoryTimeGet(
           std::string(kHistogramName) + base::SizeTToString(file_index),
           base::TimeDelta::FromMilliseconds(1),
-          base::TimeDelta::FromSeconds(20),
-          50,
+          base::TimeDelta::FromSeconds(20), 50,
           base::Histogram::kUmaTargetedHistogramFlag);
 
-    signature_verification_time_histogram->AddTime(verification_time);
+  signature_verification_time_histogram->AddTime(verification_time);
 }
 
-}  // namespace
-
 void RegisterBinaryIntegrityAnalysis() {
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_MACOSX)
   scoped_refptr<SafeBrowsingService> safe_browsing_service(
       g_browser_process->safe_browsing_service());
 
   safe_browsing_service->RegisterDelayedAnalysisCallback(
       base::Bind(&VerifyBinaryIntegrity));
 #endif
 }
 
+#if !defined(OS_MACOSX)
 void VerifyBinaryIntegrity(scoped_ptr<IncidentReceiver> incident_receiver) {
   scoped_refptr<BinaryFeatureExtractor> binary_feature_extractor(
       new BinaryFeatureExtractor());
 
   std::vector<base::FilePath> critical_binaries = GetCriticalBinariesPath();
   for (size_t i = 0; i < critical_binaries.size(); ++i) {
     base::FilePath binary_path(critical_binaries[i]);
     if (!base::PathExists(binary_path))
       continue;
 
@@ skipping 16 matching lines @@
       // Send the report.
       incident_receiver->AddIncidentForProcess(
           make_scoped_ptr(new BinaryIntegrityIncident(incident.Pass())));
     } else {
       // The binary is integral, remove previous report so that next incidents
       // for the binary will be reported.
       scoped_ptr<ClientIncidentReport_IncidentData_BinaryIntegrityIncident>
           incident(
               new ClientIncidentReport_IncidentData_BinaryIntegrityIncident());
       incident->set_file_basename(binary_path.BaseName().AsUTF8Unsafe());
       incident_receiver->ClearIncidentForProcess(

[mattm, 2015/10/21 02:06:34]

This doesn't appear in the mac version. Should it?

[Greg K, 2015/10/27 01:06:18]

I talked to some of the safe browsing engineers, and indeed it should. I missed
this because I didn't understood what it was doing but they clarified for me:
this is so that after an update, if the modified files are restored, it will
report about any new modifications in the future.

           make_scoped_ptr(new BinaryIntegrityIncident(incident.Pass())));
     }
   }
 }
+#endif  // !defined(OS_MACOSX)
 
 #if !defined(OS_WIN)
 std::vector<base::FilePath> GetCriticalBinariesPath() {
   return std::vector<base::FilePath>();
 }
 #endif  // !defined(OS_WIN)
 
 }  // namespace safe_browsing