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

Unified Diff: ios/chrome/browser/ui/settings/dataplan_usage_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/dataplan_usage_collection_view_controller_unittest.mm
diff --git a/ios/chrome/browser/ui/settings/dataplan_usage_collection_view_controller_unittest.mm b/ios/chrome/browser/ui/settings/dataplan_usage_collection_view_controller_unittest.mm
index e3814efc4f00be8afe13ad24e9849c3da09dda79..cd923e340204fddef0e02171ce66e0b52aa59832 100644
--- a/ios/chrome/browser/ui/settings/dataplan_usage_collection_view_controller_unittest.mm
+++ b/ios/chrome/browser/ui/settings/dataplan_usage_collection_view_controller_unittest.mm
@@ -19,6 +19,10 @@
#include "testing/gtest/include/gtest/gtest.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 DataplanUsageCollectionViewController (ExposedForTesting)
- (void)updateBasePref:(BOOL)basePref wifiPref:(BOOL)wifiPref;
@end
@@ -37,13 +41,13 @@ class DataplanUsageCollectionViewControllerTest
CreateController();
}
- CollectionViewController* NewController() override NS_RETURNS_RETAINED {
- dataplanController_.reset([[DataplanUsageCollectionViewController alloc]
+ CollectionViewController* InstantiateController() override {
+ dataplanController_ = [[DataplanUsageCollectionViewController alloc]
initWithPrefs:pref_service_.get()
basePref:kBasePref
wifiPref:kWifiPref
- title:@"CollectionTitle"]);
- return [dataplanController_ retain];
+ title:@"CollectionTitle"];
+ return dataplanController_;
}
std::unique_ptr<PrefService> CreateLocalState() {
@@ -66,8 +70,7 @@ class DataplanUsageCollectionViewControllerTest
base::MessageLoopForUI message_loop_;
std::unique_ptr<PrefService> pref_service_;
- base::scoped_nsobject<DataplanUsageCollectionViewController>
- dataplanController_;
+ DataplanUsageCollectionViewController* dataplanController_;
};
TEST_F(DataplanUsageCollectionViewControllerTest, TestModel) {

Powered by Google App Engine
This is Rietveld 408576698