Index: ios/chrome/browser/chrome_coordinator.mm |
diff --git a/ios/chrome/browser/chrome_coordinator.mm b/ios/chrome/browser/chrome_coordinator.mm |
index a5eced205bd6125c75a5a2f7316f4d837621838d..18f2c65a5e0790054c4f536c48d78ea1878b5f1a 100644 |
--- a/ios/chrome/browser/chrome_coordinator.mm |
+++ b/ios/chrome/browser/chrome_coordinator.mm |
@@ -4,13 +4,15 @@ |
#import "ios/chrome/browser/chrome_coordinator.h" |
-#include "base/ios/weak_nsobject.h" |
#include "base/logging.h" |
-#import "base/mac/scoped_nsobject.h" |
+ |
+#if !defined(__has_feature) || !__has_feature(objc_arc) |
+#error "This file requires ARC support." |
+#endif |
@interface ChromeCoordinator () { |
- base::WeakNSObject<UIViewController> _baseViewController; |
- base::scoped_nsobject<MutableCoordinatorArray> _childCoordinators; |
+ __weak UIViewController* _baseViewController; |
+ MutableCoordinatorArray* _childCoordinators; |
} |
@end |
@@ -19,8 +21,8 @@ |
- (nullable instancetype)initWithBaseViewController: |
(UIViewController*)viewController { |
if (self = [super init]) { |
- _baseViewController.reset(viewController); |
- _childCoordinators.reset([[MutableCoordinatorArray array] retain]); |
+ _baseViewController = viewController; |
+ _childCoordinators = [MutableCoordinatorArray array]; |
} |
return self; |
} |
@@ -32,7 +34,6 @@ |
- (void)dealloc { |
[self stop]; |
- [super dealloc]; |
} |
- (MutableCoordinatorArray*)childCoordinators { |