Mac/clang: Possibly contentious changes.

chrome/browser/cocoa/keystone_glue.mm

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/cocoa/keystone_glue.h"
 
 #include <sys/param.h>
 #include <sys/mount.h>
 
 #include <vector>
@@ skipping 14 matching lines @@
 typedef enum {
   kKSPathExistenceChecker,
 } KSExistenceCheckerType;
 
 typedef enum {
   kKSRegistrationUserTicket,
   kKSRegistrationSystemTicket,
   kKSRegistrationDontKnowWhatKindOfTicket,
 } KSRegistrationTicketType;
 
-NSString* KSRegistrationVersionKey = @"Version";
-NSString* KSRegistrationExistenceCheckerTypeKey = @"ExistenceCheckerType";
-NSString* KSRegistrationExistenceCheckerStringKey = @"ExistenceCheckerString";
-NSString* KSRegistrationServerURLStringKey = @"URLString";
-NSString* KSRegistrationPreserveTrustedTesterTokenKey = @"PreserveTTT";
-NSString* KSRegistrationTagKey = @"Tag";
-NSString* KSRegistrationTagPathKey = @"TagPath";
-NSString* KSRegistrationTagKeyKey = @"TagKey";
-NSString* KSRegistrationBrandPathKey = @"BrandPath";
-NSString* KSRegistrationBrandKeyKey = @"BrandKey";
+NSString* const KSRegistrationVersionKey = @"Version";
+NSString* const KSRegistrationExistenceCheckerTypeKey = @"ExistenceCheckerType";
+NSString* const KSRegistrationExistenceCheckerStringKey =
+    @"ExistenceCheckerString";
+NSString* const KSRegistrationServerURLStringKey = @"URLString";
+NSString* const KSRegistrationPreserveTrustedTesterTokenKey = @"PreserveTTT";
+NSString* const KSRegistrationTagKey = @"Tag";
+NSString* const KSRegistrationTagPathKey = @"TagPath";
+NSString* const KSRegistrationTagKeyKey = @"TagKey";
+NSString* const KSRegistrationBrandPathKey = @"BrandPath";
+NSString* const KSRegistrationBrandKeyKey = @"BrandKey";
 
-NSString *KSRegistrationDidCompleteNotification =
+NSString* const KSRegistrationDidCompleteNotification =
     @"KSRegistrationDidCompleteNotification";
-NSString *KSRegistrationPromotionDidCompleteNotification =
+NSString* const KSRegistrationPromotionDidCompleteNotification =
     @"KSRegistrationPromotionDidCompleteNotification";
 
-NSString *KSRegistrationCheckForUpdateNotification =
+NSString* const KSRegistrationCheckForUpdateNotification =
     @"KSRegistrationCheckForUpdateNotification";
-NSString *KSRegistrationStatusKey = @"Status";
-NSString *KSRegistrationUpdateCheckErrorKey = @"Error";
+NSString* KSRegistrationStatusKey = @"Status";
+NSString* KSRegistrationUpdateCheckErrorKey = @"Error";
 
-NSString *KSRegistrationStartUpdateNotification =
+NSString* const KSRegistrationStartUpdateNotification =
     @"KSRegistrationStartUpdateNotification";
-NSString *KSUpdateCheckSuccessfulKey = @"CheckSuccessful";
-NSString *KSUpdateCheckSuccessfullyInstalledKey = @"SuccessfullyInstalled";
+NSString* const KSUpdateCheckSuccessfulKey = @"CheckSuccessful";
+NSString* const KSUpdateCheckSuccessfullyInstalledKey =
+    @"SuccessfullyInstalled";
 
-NSString *KSRegistrationRemoveExistingTag = @"";
+NSString* const KSRegistrationRemoveExistingTag = @"";
 #define KSRegistrationPreserveExistingTag nil
 
 // Constants for the brand file (uses an external file so it can survive updates
 // to Chrome.
 
 #if defined(GOOGLE_CHROME_BUILD)
 #define kBrandFileName @"Google Chrome Brand.plist";
 #elif defined(CHROMIUM_BUILD)
 #define kBrandFileName @"Chromium Brand.plist";
 #else
@@ skipping 96 matching lines @@
 // -changePermissionsForPromotionComplete is called on the main thread.
 - (void)changePermissionsForPromotionAsync;
 - (void)changePermissionsForPromotionWithTool:(NSString*)toolPath;
 - (void)changePermissionsForPromotionComplete;
 
 // Returns the brand file path to use for Keystone.
 - (NSString*)brandFilePath;
 
 @end  // @interface KeystoneGlue(Private)
 
-const NSString* const kAutoupdateStatusNotification =
-    @"AutoupdateStatusNotification";
-const NSString* const kAutoupdateStatusStatus = @"status";
-const NSString* const kAutoupdateStatusVersion = @"version";
+NSString* const kAutoupdateStatusNotification = @"AutoupdateStatusNotification";
+NSString* const kAutoupdateStatusStatus = @"status";
+NSString* const kAutoupdateStatusVersion = @"version";
 
 namespace {
 
-const NSString* const kChannelKey = @"KSChannelID";
-const NSString* const kBrandKey = @"KSBrandID";
+NSString* const kChannelKey = @"KSChannelID";
+NSString* const kBrandKey = @"KSBrandID";
 
 }  // namespace
 
 @implementation KeystoneGlue
 
 + (id)defaultKeystoneGlue {
   static bool sTriedCreatingDefaultKeystoneGlue = false;
   // TODO(jrg): use base::SingletonObjC<KeystoneGlue>
   static KeystoneGlue* sDefaultKeystoneGlue = nil;  // leaked
 
@@ skipping 693 matching lines @@
 }
 
 - (void)setAppPath:(NSString*)appPath {
   if (appPath != appPath_) {
     [appPath_ release];
     appPath_ = [appPath copy];
   }
 }
 
 @end  // @implementation KeystoneGlue