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

Unified Diff: ios/chrome/browser/ui/settings/settings_root_collection_view_controller_unittest.mm

Issue 2806323003: [ObjC ARC] Converts ios/chrome/browser/ui/settings:unit_tests to ARC. (Closed)
Patch Set: rebase Created 3 years, 8 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/settings/settings_root_collection_view_controller_unittest.mm
diff --git a/ios/chrome/browser/ui/settings/settings_root_collection_view_controller_unittest.mm b/ios/chrome/browser/ui/settings/settings_root_collection_view_controller_unittest.mm
index 32144bdd497b5fc8c626b80d21047560029ab0a5..5f18be24a0997c216d7b4d711f309dc202823325 100644
--- a/ios/chrome/browser/ui/settings/settings_root_collection_view_controller_unittest.mm
+++ b/ios/chrome/browser/ui/settings/settings_root_collection_view_controller_unittest.mm
@@ -6,13 +6,16 @@
#import <Foundation/Foundation.h>
-#import "base/mac/scoped_nsobject.h"
#import "ios/chrome/browser/ui/collection_view/cells/collection_view_item.h"
#import "ios/chrome/browser/ui/collection_view/collection_view_model.h"
#include "testing/gtest/include/gtest/gtest.h"
#import "testing/gtest_mac.h"
#include "testing/platform_test.h"
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
@interface TestSettingsRootCollectionViewController
: SettingsRootCollectionViewController
@property(nonatomic, readonly) NSMutableArray* items;
@@ -20,18 +23,18 @@
@end
@implementation TestSettingsRootCollectionViewController {
- base::scoped_nsobject<NSMutableArray> _items;
+ NSMutableArray* _items;
}
- (NSMutableArray*)items {
if (!_items) {
- _items.reset([[NSMutableArray alloc] init]);
+ _items = [[NSMutableArray alloc] init];
}
- return _items.get();
+ return _items;
}
- (void)reset {
- _items.reset();
+ _items = nil;
}
- (void)loadModel {
@@ -55,9 +58,8 @@ class SettingsRootCollectionViewControllerTest : public PlatformTest {
SettingsRootCollectionViewControllerTest()
: controller_([[TestSettingsRootCollectionViewController alloc]
initWithStyle:CollectionViewControllerStyleDefault]) {
- item1_.reset([[CollectionViewItem alloc] initWithType:kItemTypeEnumZero]);
- item2_.reset(
- [[CollectionViewItem alloc] initWithType:kItemTypeEnumZero + 10]);
+ item1_ = [[CollectionViewItem alloc] initWithType:kItemTypeEnumZero];
+ item2_ = [[CollectionViewItem alloc] initWithType:kItemTypeEnumZero + 10];
}
protected:
@@ -83,9 +85,9 @@ class SettingsRootCollectionViewControllerTest : public PlatformTest {
return [controller().collectionViewModel numberOfItemsInSection:section];
}
- base::scoped_nsobject<TestSettingsRootCollectionViewController> controller_;
- base::scoped_nsobject<CollectionViewItem> item1_;
- base::scoped_nsobject<CollectionViewItem> item2_;
+ TestSettingsRootCollectionViewController* controller_;
+ CollectionViewItem* item1_;
+ CollectionViewItem* item2_;
};
TEST_F(SettingsRootCollectionViewControllerTest, Empty) {

Powered by Google App Engine
This is Rietveld 408576698