Mac/clang: Possibly contentious changes.

chrome/browser/cocoa/keystone_glue.h

 // 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.
 
 #ifndef CHROME_BROWSER_COCOA_KEYSTONE_GLUE_H_
 #define CHROME_BROWSER_COCOA_KEYSTONE_GLUE_H_
 
 #import <Foundation/Foundation.h>
 #import <base/scoped_nsobject.h>
 
@@ skipping 21 matching lines @@
   kAutoupdatePromoteFailed,   // no version
 };
 
 // kAutoupdateStatusNotification is the name of the notification posted when
 // -checkForUpdate and -installUpdate complete.  This notification will be
 // sent with with its sender object set to the KeystoneGlue instance sending
 // the notification.  Its userInfo dictionary will contain an AutoupdateStatus
 // value as an intValue at key kAutoupdateStatusStatus.  If a version is
 // available (see AutoupdateStatus), it will be present at key
 // kAutoupdateStatusVersion.
-extern const NSString* const kAutoupdateStatusNotification;
-extern const NSString* const kAutoupdateStatusStatus;
-extern const NSString* const kAutoupdateStatusVersion;
+extern NSString* const kAutoupdateStatusNotification;
+extern NSString* const kAutoupdateStatusStatus;
+extern NSString* const kAutoupdateStatusVersion;
 
 namespace {
-  enum BrandFileType {
-    kBrandFileTypeNotDetermined = 0,
-    kBrandFileTypeNone,
-    kBrandFileTypeUser,
-    kBrandFileTypeSystem,
-  };
+
+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
 // developer builds) don't want or need Keystone support and might not even
 // have the framework available.  Enabling Keystone support in an application
 // that uses KeystoneGlue is as simple as dropping
 // KeystoneRegistration.framework in the application's Frameworks directory
@@ skipping 118 matching lines @@
 
 // Called when a checkForUpdate: notification completes.
 - (void)checkForUpdateComplete:(NSNotification*)notification;
 
 // Called when an installUpdate: notification completes.
 - (void)installUpdateComplete:(NSNotification*)notification;
 
 @end  // @interface KeystoneGlue(ExposedForTesting)
 
 #endif  // CHROME_BROWSER_COCOA_KEYSTONE_GLUE_H_