Index: chrome/browser/ui/cocoa/spinner_view_unittest.mm |
diff --git a/chrome/browser/ui/cocoa/spinner_view_unittest.mm b/chrome/browser/ui/cocoa/spinner_view_unittest.mm |
index 3f73c28c3e97c8c40cf63d9b92c8f054504a60cd..93d652c71e4e6a829222aa482757fab0db55efae 100644 |
--- a/chrome/browser/ui/cocoa/spinner_view_unittest.mm |
+++ b/chrome/browser/ui/cocoa/spinner_view_unittest.mm |
@@ -1,4 +1,4 @@ |
-// Copyright (c) 2015 The Chromium Authors. All rights reserved. |
+// Copyright 2015 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. |
@@ -6,65 +6,64 @@ |
#import "ui/gfx/test/ui_cocoa_test_helper.h" |
-@interface SpinnerView(ExposedForTesting) |
+@interface SpinnerView (ExposedForTesting) |
-- (BOOL)is_animating; |
+- (BOOL)isAnimating; |
@end |
-@implementation SpinnerView(ExposedForTesting) |
+@implementation SpinnerView (ExposedForTesting) |
-- (BOOL)is_animating |
-{ |
- return is_animating_; |
+- (BOOL)isAnimating { |
+ return isAnimating_; |
} |
@end |
namespace { |
- class SpinnerViewTest : public ui::CocoaTest { |
- public: |
- SpinnerViewTest() { |
- CGRect frame = NSMakeRect(0.0, 0.0, 16.0, 16.0); |
- view_.reset([[SpinnerView alloc] initWithFrame:frame]); |
- [[test_window() contentView] addSubview:view_]; |
- } |
+class SpinnerViewTest : public ui::CocoaTest { |
+ public: |
+ SpinnerViewTest() { |
+ CGRect frame = NSMakeRect(0.0, 0.0, 16.0, 16.0); |
+ view_.reset([[SpinnerView alloc] initWithFrame:frame]); |
+ [[test_window() contentView] addSubview:view_]; |
+ } |
- base::scoped_nsobject<SpinnerView> view_; |
- }; |
+ base::scoped_nsobject<SpinnerView> view_; |
+}; |
- TEST_VIEW(SpinnerViewTest, view_) |
+TEST_VIEW(SpinnerViewTest, view_) |
- TEST_F(SpinnerViewTest, StopAnimationOnMiniaturize) { |
- EXPECT_TRUE([view_ is_animating]); |
+TEST_F(SpinnerViewTest, StopAnimationOnMiniaturize) { |
+ EXPECT_TRUE([view_ isAnimating]); |
- [test_window() miniaturize:nil]; |
- EXPECT_FALSE([view_ is_animating]); |
+ [test_window() miniaturize:nil]; |
+ EXPECT_FALSE([view_ isAnimating]); |
- [test_window() deminiaturize:nil]; |
- EXPECT_TRUE([view_ is_animating]); |
- } |
+ [test_window() deminiaturize:nil]; |
+ EXPECT_TRUE([view_ isAnimating]); |
+} |
- TEST_F(SpinnerViewTest, |
- StopAnimationOnRemoveFromSuperview) { |
- EXPECT_TRUE([view_ is_animating]); |
+TEST_F(SpinnerViewTest, |
+ StopAnimationOnRemoveFromSuperview) { |
+ EXPECT_TRUE([view_ isAnimating]); |
- [view_ removeFromSuperview]; |
- EXPECT_FALSE([view_ is_animating]); |
+ [view_ removeFromSuperview]; |
+ EXPECT_FALSE([view_ isAnimating]); |
- [[test_window() contentView] addSubview:view_]; |
- EXPECT_TRUE([view_ is_animating]); |
- } |
+ [[test_window() contentView] addSubview:view_]; |
+ EXPECT_TRUE([view_ isAnimating]); |
+} |
- TEST_F(SpinnerViewTest, StopAnimationOnHidden) { |
- EXPECT_TRUE([view_ is_animating]); |
+TEST_F(SpinnerViewTest, StopAnimationOnHidden) { |
+ EXPECT_TRUE([view_ isAnimating]); |
- [view_ setHidden:YES]; |
- EXPECT_FALSE([view_ is_animating]); |
+ [view_ setHidden:YES]; |
+ EXPECT_FALSE([view_ isAnimating]); |
- [view_ setHidden:NO]; |
- EXPECT_TRUE([view_ is_animating]); |
- } |
+ [view_ setHidden:NO]; |
+ EXPECT_TRUE([view_ isAnimating]); |
} |
+} // namespace |