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

Unified Diff: ios/chrome/browser/ui/settings/import_data_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/import_data_collection_view_controller_unittest.mm
diff --git a/ios/chrome/browser/ui/settings/import_data_collection_view_controller_unittest.mm b/ios/chrome/browser/ui/settings/import_data_collection_view_controller_unittest.mm
index 1ce510a29ed2f175b50a3127f8755e1266f64e57..c9f2563fa1128ed2be958b76a089b4abd5694506 100644
--- a/ios/chrome/browser/ui/settings/import_data_collection_view_controller_unittest.mm
+++ b/ios/chrome/browser/ui/settings/import_data_collection_view_controller_unittest.mm
@@ -16,6 +16,10 @@
#include "testing/platform_test.h"
#include "ui/base/l10n/l10n_util_mac.h"
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
@interface ImportDataControllerTestDelegate
: NSObject<ImportDataControllerDelegate>
@property(nonatomic, readonly) BOOL didChooseClearDataPolicyCalled;
@@ -48,8 +52,8 @@ class ImportDataCollectionViewControllerTest
is_signed_in_ = true;
}
- CollectionViewController* NewController() override NS_RETURNS_RETAINED {
- delegate_.reset([[ImportDataControllerTestDelegate alloc] init]);
+ CollectionViewController* InstantiateController() override {
+ delegate_ = [[ImportDataControllerTestDelegate alloc] init];
return [[ImportDataCollectionViewController alloc]
initWithDelegate:delegate_
fromEmail:@"fromEmail@gmail.com"
@@ -60,7 +64,7 @@ class ImportDataCollectionViewControllerTest
void set_is_signed_in(bool is_signed_in) { is_signed_in_ = is_signed_in; }
bool is_signed_in_;
- base::scoped_nsobject<ImportDataControllerTestDelegate> delegate_;
+ ImportDataControllerTestDelegate* delegate_;
};
TEST_F(ImportDataCollectionViewControllerTest, TestModelSignedIn) {
@@ -153,7 +157,10 @@ TEST_F(ImportDataCollectionViewControllerTest, TestDefaultChoiceSignedIn) {
EXPECT_FALSE(delegate().didChooseClearDataPolicyCalled);
UIBarButtonItem* item = controller().navigationItem.rightBarButtonItem;
ASSERT_TRUE(item);
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
[item.target performSelector:item.action];
+#pragma clang diagnostic pop
EXPECT_TRUE(delegate().didChooseClearDataPolicyCalled);
EXPECT_EQ(SHOULD_CLEAR_DATA_CLEAR_DATA, delegate().shouldClearData);
@@ -169,7 +176,10 @@ TEST_F(ImportDataCollectionViewControllerTest, TestDefaultChoiceSignedOut) {
EXPECT_FALSE(delegate().didChooseClearDataPolicyCalled);
UIBarButtonItem* item = controller().navigationItem.rightBarButtonItem;
ASSERT_TRUE(item);
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
[item.target performSelector:item.action];
+#pragma clang diagnostic pop
EXPECT_TRUE(delegate().didChooseClearDataPolicyCalled);
EXPECT_EQ(SHOULD_CLEAR_DATA_MERGE_DATA, delegate().shouldClearData);

Powered by Google App Engine
This is Rietveld 408576698