Mac/clang: Possibly contentious changes.

chrome/browser/cocoa/bookmark_bar_controller_unittest.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 <Cocoa/Cocoa.h>
 
 #include "app/theme_provider.h"
 #include "base/basictypes.h"
 #include "base/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
@@ skipping 34 matching lines @@
 }
 @end
 
 
 // NSCell that is pre-provided with a desired size that becomes the
 // return value for -(NSSize)cellSize:.
 @interface CellWithDesiredSize : NSCell {
  @private
   NSSize cellSize_;
 }
-@property(readonly) NSSize cellSize;
+@property (nonatomic, readonly) NSSize cellSize;
 @end
 
 @implementation CellWithDesiredSize
 
 @synthesize cellSize = cellSize_;
 
 - (id)initTextCell:(NSString*)string desiredSize:(NSSize)size {
   if ((self = [super initTextCell:string])) {
     cellSize_ = size;
   }
   return self;
 }
 
 @end
 
 // Remember the number of times we've gotten a frameDidChange notification.
 @interface BookmarkBarControllerTogglePong : BookmarkBarControllerNoOpen {
  @private
   int toggles_;
 }
-@property (readonly) int toggles;
+@property (nonatomic, readonly) int toggles;
 @end
 
 @implementation BookmarkBarControllerTogglePong
 
 @synthesize toggles = toggles_;
 
 - (void)frameDidChange {
   toggles_++;
 }
 
 @end
 
 // Remembers if a notification callback was called.
 @interface BookmarkBarControllerNotificationPong : BookmarkBarControllerNoOpen {
   BOOL windowWillCloseReceived_;
   BOOL windowDidResignKeyReceived_;
 }
-@property(readonly) BOOL windowWillCloseReceived;
-@property(readonly) BOOL windowDidResignKeyReceived;
+@property (nonatomic, readonly) BOOL windowWillCloseReceived;
+@property (nonatomic, readonly) BOOL windowDidResignKeyReceived;
 @end
 
 @implementation BookmarkBarControllerNotificationPong
 @synthesize windowWillCloseReceived = windowWillCloseReceived_;
 @synthesize windowDidResignKeyReceived = windowDidResignKeyReceived_;
 
 // Override NSNotificationCenter callback.
 - (void)parentWindowWillClose:(NSNotification*)notification {
   windowWillCloseReceived_ = YES;
 }
 
 // NSNotificationCenter callback.
 - (void)parentWindowDidResignKey:(NSNotification*)notification {
   windowDidResignKeyReceived_ = YES;
 }
 @end
 
 // Remembers if and what kind of openAll was performed.
 @interface BookmarkBarControllerOpenAllPong : BookmarkBarControllerNoOpen {
   WindowOpenDisposition dispositionDetected_;
 }
-@property WindowOpenDisposition dispositionDetected;
+@property (nonatomic) WindowOpenDisposition dispositionDetected;
 @end
 
 @implementation BookmarkBarControllerOpenAllPong
 @synthesize dispositionDetected = dispositionDetected_;
 
 // Intercede for the openAll:disposition: method.
 - (void)openAll:(const BookmarkNode*)node
     disposition:(WindowOpenDisposition)disposition {
   [self setDispositionDetected:disposition];
 }
@@ skipping 66 matching lines @@
     return nil;
   }
 };
 
 
 @interface FakeDragInfo : NSObject {
  @public
   NSPoint dropLocation_;
   NSDragOperation sourceMask_;
 }
-@property (assign) NSPoint dropLocation;
+@property (nonatomic, assign) NSPoint dropLocation;
 - (void)setDraggingSourceOperationMask:(NSDragOperation)mask;
 @end
 
 @implementation FakeDragInfo
 
 @synthesize dropLocation = dropLocation_;
 
 - (id)init {
   if ((self = [super init])) {
     dropLocation_ = NSZeroPoint;
@@ skipping 1760 matching lines @@
   EXPECT_CGFLOAT_EQ(expected, actual);
   targetButton = [bar_ buttonWithTitleEqualTo:@"4b"];
   targetPoint = [targetButton right];
   targetPoint.x += 100;  // Somewhere off to the right.
   expected = NSMaxX([targetButton frame]) + xDelta;
   actual = [bar_ indicatorPosForDragToPoint:targetPoint];
   EXPECT_CGFLOAT_EQ(expected, actual);
 }
 
 }  // namespace