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

chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer.h

Index: chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer.h
diff --git a/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer.h b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer.h
index 6ac4532aaae29578ce7cdc784a9de7e37fb7c0b9..08ec2d0856f634cebee516e34539245e6e8f2c82 100644
--- a/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer.h
+++ b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer.h
@@ -5,12 +5,15 @@
 #ifndef CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_BINARY_INTEGRITY_ANALYZER_H_
 #define CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_BINARY_INTEGRITY_ANALYZER_H_
 
+#include <string>
+#include <utility>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 
 namespace base {
 class FilePath;
+class TimeDelta;
 }  // namespace base
 
 namespace safe_browsing {
@@ -29,6 +32,23 @@ void VerifyBinaryIntegrity(scoped_ptr<IncidentReceiver> incident_receiver);
 // Returns a vector containing the paths to all the binaries to verify.
 std::vector<base::FilePath> GetCriticalBinariesPath();
 
+// Record how long the signature verification took.
+void RecordSignatureVerificationTime(size_t file_index,
+                                     const base::TimeDelta& verification_time);
+
+#if defined(OS_MACOSX)
+// Returns a vector of pairs, each of which contains the paths to the binaries
+// to verify, and the codesign requirement to use when verifying.
+std::vector<std::pair<base::FilePath, std::string>>

[Mark Mentovai, 2015/10/16 22:46:40]

The pair interface isn’t the most lovely because what’s .first and what’s
.second? This can be a vector<some_simple_struct> which lets the code that uses
it reference the fields by more meaningful names.

[Greg K, 2015/10/19 20:42:58]

Done.

+GetCriticalPathsAndRequirements();
+
+// This is a helper stub to allow the signature checking code to be tested with
+// custom requirements and files.
+void VerifyBinaryIntegrityForTesting(IncidentReceiver* incident_receiver,
+                                     const base::FilePath& path,
+                                     const std::string& requirement);
+#endif  // defined(OS_MACOSX)
+
 }  // namespace safe_browsing
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_BINARY_INTEGRITY_ANALYZER_H_