[Mac] Brand code support on the Mac:

- During keystone registration pull in the brand file at user to system level.
- Clean up old user level brand files after moving to a system ticket.
- During keystone ticket promotion, use the pref flight script to copy the brand information out to the system level.
- When updating check to see if the user had manually updated the app and gotten a new brand code, if so, migrate that code into the right location.

BUG=39131
TEST=email from tvl to QA with details.
Review URL: http://codereview.chromium.org/1687012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45687 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 0 deletions

diff --git a/chrome/browser/cocoa/keystone_glue.h b/chrome/browser/cocoa/keystone_glue.h
index 81d74a3..6ae4c1f 100644
--- a/chrome/browser/cocoa/keystone_glue.h
+++ b/chrome/browser/cocoa/keystone_glue.h
@@ -43,6 +43,16 @@ extern const NSString* const kAutoupdateStatusNotification;
 extern const NSString* const kAutoupdateStatusStatus;
 extern const NSString* const kAutoupdateStatusVersion;
 
+namespace {
+  enum BrandFileType {
+    kBrandFileTypeNotDetermined = 0,
+    kBrandFileTypeNone,
+    kBrandFileTypeUser,
+    kBrandFileTypeSystem,
+  };
+
+} // namespace
+
 // KeystoneGlue is an adapter around the KSRegistration class, allowing it to
 // be used without linking directly against its containing KeystoneRegistration
 // framework.  This is used in an environment where most builds (such as
@@ -66,6 +76,7 @@ extern const NSString* const kAutoupdateStatusVersion;
   NSString* url_;
   NSString* version_;
   NSString* channel_;  // Logically: Dev, Beta, or Stable.
+  BrandFileType brandFileType_;
 
   // And the Keystone registration itself, with the active timer
   KSRegistration* registration_;  // strong