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..6e7be92e090bcb893b1cd09d4f5421850cbb3079 100644
--- a/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer.h
+++ b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer.h
@@ -11,6 +11,7 @@
 
 namespace base {
 class FilePath;
+class TimeDelta;
 }  // namespace base
 
 namespace safe_browsing {
@@ -29,6 +30,22 @@ 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>>

[grt (UTC plus 2), 2015/10/03 20:02:59]

#include <string> for std::string
#include <utility> for std::pair

[Greg K, 2015/10/07 22:54:28]

Done.

+GetCriticalPathsAndRequirements();
+// This is a helper stub to allow us to test this mechanism with

[Robert Sesek, 2015/10/05 22:19:07]

Rather than exposing the helper directly, you should create a function
VerifyBinaryIntegrityForTesting() that calls the internal version. *ForTesting
is forbidden by presubmit from being called in non-test files.

[Greg K, 2015/10/07 22:54:28]

Done.

+// alternatively signed code.

[Mark Mentovai, 2015/10/05 15:02:11]

What does “alternatively signed” mean?

[Greg K, 2015/10/07 22:54:28]

Clarified the comment. 

+void VerifyBinaryIntegrityHelper(scoped_ptr<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_