Reland of: Profile_Metrics integration with Keystone

chrome/browser/mac/keystone_registration.h

Index: chrome/browser/mac/keystone_registration.h
diff --git a/chrome/browser/mac/keystone_registration.h b/chrome/browser/mac/keystone_registration.h
index 056dde1f0b58ada46470544aa54e9735bcfe7cb5..3fa9197fa451703fc31358e27041eb0c81f265d7 100644
--- a/chrome/browser/mac/keystone_registration.h
+++ b/chrome/browser/mac/keystone_registration.h
@@ -48,10 +48,19 @@ extern NSString* KSUpdateCheckSuccessfulKey;
 extern NSString* KSUpdateCheckSuccessfullyInstalledKey;
 
 extern NSString* KSRegistrationRemoveExistingTag;
+
+extern NSString* KSReportingAttributeValueKey;
+extern NSString* KSReportingAttributeExpirationDateKey;
+extern NSString* KSReportingAttributeAggregationTypeKey;
 #define KSRegistrationPreserveExistingTag nil
 
 }  // namespace keystone_registration
 
+typedef enum {
+  kKSReportingAggregationSum = 0,  // Adds attribute value across user accounts
+  kKSReportingAggregationDefault = kKSReportingAggregationSum,
+} KSReportingAggregationType;
+
 @interface KSRegistration : NSObject
 
 + (id)registrationWithProductID:(NSString*)productID;
@@ -62,10 +71,30 @@ extern NSString* KSRegistrationRemoveExistingTag;
                 authorization:(AuthorizationRef)authorization;
 
 - (BOOL)setActive;
+- (BOOL)setActiveWithReportingAttributes:(NSArray*)reportingAttributes
+                                   error:(NSError**)error;
 - (void)checkForUpdateWasUserInitiated:(BOOL)userInitiated;
 - (void)startUpdate;
 - (keystone_registration::KSRegistrationTicketType)ticketType;
 
 @end  // @interface KSRegistration
 
+
+// Declarations of the Keystone attribute reporting bits needed here.
+// Full definition is at:
+// //depot/googlemac/opensource/update-engine/Common/KSReportingAttribute.h
+@interface KSReportingAttribute : NSObject
+
+@end  // @interface KSReportingAttribute
+
+@interface KSUnsignedReportingAttribute : KSReportingAttribute
+
++ (KSUnsignedReportingAttribute *)reportingAttributeWithValue:(uint32_t)value
+               name:(NSString *)name
+    aggregationType:(KSReportingAggregationType)aggregationType
+              error:(NSError **)error;
+
+@end  // @interface KSUnsignedReportingAttribute
+
+
 #endif  // CHROME_BROWSER_MAC_KEYSTONE_REGISTRATION_H_