Mac/clang: Possibly contentious changes.

chrome/browser/cocoa/bookmark_bar_toolbar_view_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/scoped_nsobject.h"
 #include "chrome/browser/browser_theme_provider.h"
 #import "chrome/browser/cocoa/bookmark_bar_controller.h"
@@ skipping 43 matching lines @@
 @end
 
 // Allows us to control which way the view is rendered.
 @interface DrawDetachedBarFakeController :
     NSObject<BookmarkBarState, BookmarkBarToolbarViewController> {
  @private
   int currentTabContentsHeight_;
   ThemeProvider* themeProvider_;
   bookmarks::VisualState visualState_;
 }
-@property(assign) int currentTabContentsHeight;
-@property(assign) ThemeProvider* themeProvider;
-@property(assign) bookmarks::VisualState visualState;
+@property (nonatomic, assign) int currentTabContentsHeight;
+@property (nonatomic, assign) ThemeProvider* themeProvider;
+@property (nonatomic, assign) bookmarks::VisualState visualState;
 
 // |BookmarkBarState| protocol:
 - (BOOL)isVisible;
 - (BOOL)isAnimationRunning;
 - (BOOL)isInState:(bookmarks::VisualState)state;
 - (BOOL)isAnimatingToState:(bookmarks::VisualState)state;
 - (BOOL)isAnimatingFromState:(bookmarks::VisualState)state;
 - (BOOL)isAnimatingFromState:(bookmarks::VisualState)fromState
                      toState:(bookmarks::VisualState)toState;
 - (BOOL)isAnimatingBetweenState:(bookmarks::VisualState)fromState
@@ skipping 105 matching lines @@
   EXPECT_CALL(provider, GetBitmapNamed(IDR_THEME_NTP_BACKGROUND))
       .WillRepeatedly(Return(&fake_bg));
 
   [controller_.get() setThemeProvider:&provider];
   [controller_.get() setCurrentTabContentsHeight:200];
 
   [view_ display];
 }
 
 // TODO(viettrungluu): write more unit tests, especially after my refactoring.