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

chrome/common/safe_browsing/csd.proto

Index: chrome/common/safe_browsing/csd.proto
diff --git a/chrome/common/safe_browsing/csd.proto b/chrome/common/safe_browsing/csd.proto
index a8908c8749d6290613953f4b8a1f38444e5b629d..30dcec05adf323ee49a8740b61ea85ff07cdd8a6 100644
--- a/chrome/common/safe_browsing/csd.proto
+++ b/chrome/common/safe_browsing/csd.proto
@@ -208,6 +208,13 @@ message ClientDownloadRequest {
     repeated Element element = 1;
   }
 
+  message ExtendedAttr {
+    // This is the name of the extended attribute.
+    required string key = 1;
+    // This is the value of the extended attribute.
+    optional bytes value = 2;
+  }
+
   message SignatureInfo {
     // All certificate chains for each of the binary's signers.  Multiple chains
     // may be present if the binary or any certificate has multiple signers.
@@ -225,6 +232,11 @@ message ClientDownloadRequest {
     // On Mac, this is the code signature blob referenced by the
     // LC_CODE_SIGNATURE load command.
     repeated bytes signed_data = 3;
+
+    // On OS X, code signing data can be contained in the extended attributes of
+    // a file. As GateKeeper respects this signature, we look for it and collect
+    // it.
+    repeated ExtendedAttr xattr = 4;
   }
 
   // This field will only be set if the binary is signed.
@@ -421,10 +433,19 @@ message ClientIncidentReport {
       repeated string split_key = 3;
       optional ValueState value_state = 4;
     }
+
     message BinaryIntegrityIncident {
       optional string file_basename = 1;
       optional ClientDownloadRequest.SignatureInfo signature = 2;
+      optional ClientDownloadRequest.ImageHeaders image_headers = 3;
     }
+
+    message OSXBinaryIntegrityIncident {
+      optional string file_basename = 1;
+      optional int32 sec_error = 2;
+      repeated BinaryIntegrityIncident sub_incident = 3;
+    }
+
     message BlacklistLoadIncident {
       optional string path = 1;
       optional ClientDownloadRequest.Digests digest = 2;
@@ -453,6 +474,7 @@ message ClientIncidentReport {
     // Note: skip tag 5 because it was previously used.
     optional VariationsSeedSignatureIncident variations_seed_signature = 6;
     optional ResourceRequestIncident resource_request = 7;
+    optional OSXBinaryIntegrityIncident osx_incident = 8;
   }
 
   repeated IncidentData incident = 1;