Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(401)

Unified Diff: ios/chrome/browser/ui/ntp/new_tab_page_bar_unittest.mm

Issue 2686623007: [ObjC ARC] Converts ios/chrome/browser/ui/ntp:unit_tests to ARC. (Closed)
Patch Set: Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ios/chrome/browser/ui/ntp/new_tab_page_bar_unittest.mm
diff --git a/ios/chrome/browser/ui/ntp/new_tab_page_bar_unittest.mm b/ios/chrome/browser/ui/ntp/new_tab_page_bar_unittest.mm
index 73459f5dd4c63cb34c640692ed1aa77b98d2447d..64be9b9340484ba08810d60b6c505f236c4b3ae3 100644
--- a/ios/chrome/browser/ui/ntp/new_tab_page_bar_unittest.mm
+++ b/ios/chrome/browser/ui/ntp/new_tab_page_bar_unittest.mm
@@ -2,7 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/mac/scoped_nsobject.h"
#import "ios/chrome/browser/ui/ntp/new_tab_page_bar.h"
#import "ios/chrome/browser/ui/ntp/new_tab_page_bar_item.h"
#include "ios/chrome/browser/ui/ui_util.h"
@@ -12,6 +11,10 @@
#import "third_party/ocmock/OCMock/OCMock.h"
#import "third_party/ocmock/gtest_support.h"
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
@interface NewTabPageBar (Testing)
- (void)buttonDidTap:(UIButton*)button;
@end
@@ -22,9 +25,9 @@ class NewTabPageBarTest : public PlatformTest {
protected:
void SetUp() override {
CGRect frame = CGRectMake(0, 0, 320, 44);
- bar_.reset([[NewTabPageBar alloc] initWithFrame:frame]);
+ bar_ = [[NewTabPageBar alloc] initWithFrame:frame];
};
- base::scoped_nsobject<NewTabPageBar> bar_;
+ NewTabPageBar* bar_;
};
TEST_F(NewTabPageBarTest, SetItems) {
@@ -45,14 +48,14 @@ TEST_F(NewTabPageBarTest, SetItems) {
image:[UIImage imageNamed:@"ntp_bookmarks"]];
[bar_ setItems:[NSArray arrayWithObject:firstItem]];
- EXPECT_EQ(bar_.get().buttons.count, 1U);
+ EXPECT_EQ(bar_.buttons.count, 1U);
[bar_ setItems:[NSArray arrayWithObjects:firstItem, secondItem, nil]];
- EXPECT_EQ(bar_.get().buttons.count, 2U);
+ EXPECT_EQ(bar_.buttons.count, 2U);
[bar_ setItems:[NSArray
arrayWithObjects:firstItem, secondItem, thirdItem, nil]];
- EXPECT_EQ(bar_.get().buttons.count, 3U);
+ EXPECT_EQ(bar_.buttons.count, 3U);
[bar_ setItems:[NSArray arrayWithObject:firstItem]];
- EXPECT_EQ(bar_.get().buttons.count, 1U);
+ EXPECT_EQ(bar_.buttons.count, 1U);
}
TEST_F(NewTabPageBarTest, SetSelectedIndex_iPadOnly) {
« no previous file with comments | « ios/chrome/browser/ui/ntp/most_visited_cell_unittest.mm ('k') | ios/chrome/browser/ui/ntp/new_tab_page_controller_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698