[ObjC ARC] Converts ios/chrome/browser/ui/authentication:authentication to ARC.

ios/chrome/browser/ui/authentication/chrome_signin_view_controller.mm

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ios/chrome/browser/ui/authentication/chrome_signin_view_controller.h"
 
 #include <stdint.h>
 #include <cmath>
 #include <memory>
 
 #import <CoreGraphics/CoreGraphics.h>
 #import <QuartzCore/QuartzCore.h>
 
 #import "base/ios/block_types.h"
 #import "base/ios/ios_util.h"
-#import "base/ios/weak_nsobject.h"
 #import "base/mac/bind_objc_block.h"
-#import "base/mac/scoped_nsobject.h"
 #include "base/metrics/user_metrics.h"
 #import "base/strings/sys_string_conversions.h"
 #include "base/timer/elapsed_timer.h"
 #include "base/timer/timer.h"
 #include "components/signin/core/browser/signin_metrics.h"
 #include "components/strings/grit/components_strings.h"
 #import "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #include "ios/chrome/browser/chrome_url_constants.h"
 #import "ios/chrome/browser/signin/authentication_service.h"
 #import "ios/chrome/browser/signin/authentication_service_factory.h"
@@ skipping 20 matching lines @@
 #import "ios/public/provider/chrome/browser/chrome_browser_provider.h"
 #import "ios/public/provider/chrome/browser/signin/chrome_identity.h"
 #import "ios/public/provider/chrome/browser/signin/chrome_identity_interaction_manager.h"
 #import "ios/public/provider/chrome/browser/signin/chrome_identity_service.h"
 #import "ios/third_party/material_components_ios/src/components/ActivityIndicator/src/MaterialActivityIndicator.h"
 #import "ios/third_party/material_components_ios/src/components/Buttons/src/MaterialButtons.h"
 #import "ios/third_party/material_components_ios/src/components/Palettes/src/MaterialPalettes.h"
 #import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
 #import "ui/base/l10n/l10n_util.h"
 
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
 namespace {
 
 // Default animation duration.
 const CGFloat kAnimationDuration = 0.5f;
 
 enum LayoutType {
   LAYOUT_REGULAR,
   LAYOUT_COMPACT,
 };
 
@@ skipping 56 matching lines @@
 }
 
 }  // namespace
 
 @interface ChromeSigninViewController ()<
     ChromeIdentityInteractionManagerDelegate,
     ChromeIdentityServiceObserver,
     SigninAccountSelectorViewControllerDelegate,
     SigninConfirmationViewControllerDelegate,
     MDCActivityIndicatorDelegate>
-@property(nonatomic, retain) ChromeIdentity* selectedIdentity;
+@property(nonatomic, strong) ChromeIdentity* selectedIdentity;
 
 @end
 
 @implementation ChromeSigninViewController {
   ios::ChromeBrowserState* _browserState;  // weak
-  base::WeakNSProtocol<id<ChromeSigninViewControllerDelegate>> _delegate;
+  __weak id<ChromeSigninViewControllerDelegate> _delegate;
   std::unique_ptr<ChromeIdentityServiceObserverBridge> _identityServiceObserver;
-  base::scoped_nsobject<ChromeIdentity> _selectedIdentity;
+  ChromeIdentity* _selectedIdentity;
 
   // Authentication
-  base::scoped_nsobject<AlertCoordinator> _alertCoordinator;
-  base::scoped_nsobject<AuthenticationFlow> _authenticationFlow;
+  AlertCoordinator* _alertCoordinator;
+  AuthenticationFlow* _authenticationFlow;
   BOOL _addedAccount;
   BOOL _autoSignIn;
   BOOL _didSignIn;
   BOOL _didAcceptSignIn;
   BOOL _didFinishSignIn;
   BOOL _isPresentedOnSettings;
   signin_metrics::AccessPoint _accessPoint;
   signin_metrics::PromoAction _promoAction;
-  base::scoped_nsobject<ChromeIdentityInteractionManager> _interactionManager;
+  ChromeIdentityInteractionManager* _interactionManager;
 
   // Basic state.
   AuthenticationState _currentState;
   BOOL _ongoingStateChange;
-  base::scoped_nsobject<MDCActivityIndicator> _activityIndicator;
-  base::scoped_nsobject<MDCButton> _primaryButton;
-  base::scoped_nsobject<MDCButton> _secondaryButton;
-  base::scoped_nsobject<UIView> _gradientView;
-  base::scoped_nsobject<CAGradientLayer> _gradientLayer;
+  MDCActivityIndicator* _activityIndicator;
+  MDCButton* _primaryButton;
+  MDCButton* _secondaryButton;
+  UIView* _gradientView;
+  CAGradientLayer* _gradientLayer;
 
   // Identity picker state.
-  base::scoped_nsobject<SigninAccountSelectorViewController> _accountSelectorVC;
+  SigninAccountSelectorViewController* _accountSelectorVC;
 
   // Signin pending state.
   AuthenticationState _activityIndicatorNextState;
   std::unique_ptr<base::ElapsedTimer> _pendingStateTimer;
   std::unique_ptr<base::Timer> _leavingPendingStateTimer;
 
   // Identity selected state.
-  base::scoped_nsobject<SigninConfirmationViewController> _confirmationVC;
+  SigninConfirmationViewController* _confirmationVC;
   BOOL _hasConfirmationScreenReachedBottom;
 }
 
 @synthesize shouldClearData = _shouldClearData;
 
 - (instancetype)initWithBrowserState:(ios::ChromeBrowserState*)browserState
                isPresentedOnSettings:(BOOL)isPresentedOnSettings
                          accessPoint:(signin_metrics::AccessPoint)accessPoint
                          promoAction:(signin_metrics::PromoAction)promoAction
                       signInIdentity:(ChromeIdentity*)identity {
@@ skipping 20 matching lines @@
   // after the creation of those objects, so if the objects are not nil, then
   // it is safe to call -[UIControl removeTarget:action:forControlEvents:].
   // If they are nil, then the call does nothing.
   [_primaryButton removeTarget:self
                         action:@selector(onPrimaryButtonPressed:)
               forControlEvents:UIControlEventTouchDown];
   [_secondaryButton removeTarget:self
                           action:@selector(onSecondaryButtonPressed:)
                 forControlEvents:UIControlEventTouchDown];
   [[NSNotificationCenter defaultCenter] removeObserver:self];
-  [super dealloc];
 }
 
 - (void)cancel {
   if (_alertCoordinator) {
     DCHECK(!_authenticationFlow && !_interactionManager);
     [_alertCoordinator executeCancelHandler];
     [_alertCoordinator stop];
   }
   if (_interactionManager) {
     DCHECK(!_alertCoordinator && !_authenticationFlow);
@@ skipping 56 matching lines @@
 #pragma mark - Properties
 
 - (ios::ChromeBrowserState*)browserState {
   return _browserState;
 }
 
 - (id<ChromeSigninViewControllerDelegate>)delegate {
   return _delegate;
 }
 
 - (void)setDelegate:(id<ChromeSigninViewControllerDelegate>)delegate {

[msarda, 2017/06/12 12:49:13]

I think this setDelegate method can now be removed as it is auto-synthesized.

[marq (ping after 24h), 2017/06/12 14:20:40]

Done.

-  _delegate.reset(delegate);
+  _delegate = delegate;
 }
 
 - (UIColor*)backgroundColor {
   return [[MDCPalette greyPalette] tint50];
 }
 
 - (NSString*)identityPickerTitle {
   return l10n_util::GetNSString(IDS_IOS_ACCOUNT_CONSISTENCY_SETUP_TITLE);
 }
 
 - (NSString*)acceptSigninButtonTitle {
   return l10n_util::GetNSString(
       IDS_IOS_ACCOUNT_CONSISTENCY_CONFIRMATION_OK_BUTTON);
 }
 
 - (NSString*)skipSigninButtonTitle {
   return l10n_util::GetNSString(IDS_IOS_ACCOUNT_CONSISTENCY_SETUP_SKIP_BUTTON);
 }
 
 - (UIButton*)primaryButton {
   return _primaryButton;
 }
 
 - (UIButton*)secondaryButton {
   return _secondaryButton;
 }
 
 - (void)setSelectedIdentity:(ChromeIdentity*)identity {
   DCHECK(identity || (IDENTITY_PICKER_STATE == _currentState));
-  _selectedIdentity.reset([identity retain]);
+  _selectedIdentity = identity;
 }
 
 - (ChromeIdentity*)selectedIdentity {
   return _selectedIdentity;
 }
 
 #pragma mark - Authentication
 
 - (void)handleAuthenticationError:(NSError*)error {
   // Filter out cancel and errors handled internally by ChromeIdentity.
   if (!ShouldHandleSigninError(error)) {
     return;
   }
-  _alertCoordinator.reset(
-      [ios_internal::ErrorCoordinator(error, nil, self) retain]);
+  _alertCoordinator = ios_internal::ErrorCoordinator(error, nil, self);
   [_alertCoordinator start];
 }
 
 - (void)signIntoIdentity:(ChromeIdentity*)identity {
   [_delegate willStartSignIn:self];
   DCHECK(!_authenticationFlow);
-  _authenticationFlow.reset([[AuthenticationFlow alloc]
-          initWithBrowserState:_browserState
-                      identity:identity
-               shouldClearData:_shouldClearData
-              postSignInAction:POST_SIGNIN_ACTION_NONE
-      presentingViewController:self]);
-  base::WeakNSObject<ChromeSigninViewController> weakSelf(self);
+  _authenticationFlow =
+      [[AuthenticationFlow alloc] initWithBrowserState:_browserState
+                                              identity:identity
+                                       shouldClearData:_shouldClearData
+                                      postSignInAction:POST_SIGNIN_ACTION_NONE
+                              presentingViewController:self];
+  __weak ChromeSigninViewController* weakSelf = self;
   [_authenticationFlow startSignInWithCompletion:^(BOOL success) {
     [weakSelf onAccountSigninCompletion:success];
   }];
 }
 
 - (void)openAuthenticationDialogAddIdentity {
   DCHECK(!_interactionManager);
   _interactionManager =
       ios::GetChromeBrowserProvider()
           ->GetChromeIdentityService()
           ->NewChromeIdentityInteractionManager(_browserState, self);
-  base::WeakNSObject<ChromeSigninViewController> weakSelf(self);
+  __weak ChromeSigninViewController* weakSelf = self;
   SigninCompletionCallback completion =
       ^(ChromeIdentity* identity, NSError* error) {
-        base::scoped_nsobject<ChromeSigninViewController> strongSelf(
-            [weakSelf retain]);
-        if (!strongSelf || !strongSelf.get()->_interactionManager)
+        ChromeSigninViewController* strongSelf = weakSelf;
+        if (!strongSelf || !strongSelf->_interactionManager)
           return;
         // The ChromeIdentityInteractionManager is not used anymore at this
         // point.
-        strongSelf.get()->_interactionManager.reset();
+        strongSelf->_interactionManager = nil;
 
         if (error) {
           [strongSelf handleAuthenticationError:error];
           return;
         }
-        strongSelf.get()->_addedAccount = YES;
+        strongSelf->_addedAccount = YES;
         [strongSelf onIdentityListChanged];
         [strongSelf setSelectedIdentity:identity];
         [strongSelf changeToState:SIGNIN_PENDING_STATE];
       };
   [_delegate willStartAddAccount:self];
   [_interactionManager addAccountWithCompletion:completion];
 }
 
 - (void)onAccountSigninCompletion:(BOOL)success {
-  _authenticationFlow.reset();
+  _authenticationFlow = nil;
   if (success) {
     DCHECK(!_didSignIn);
     _didSignIn = YES;
     [_delegate didSignIn:self];
     [self changeToState:IDENTITY_SELECTED_STATE];
   } else {
     [self changeToState:IDENTITY_PICKER_STATE];
   }
 }
 
@@ skipping 85 matching lines @@
   [_primaryButton setTitle:primaryButtonTitle forState:UIControlStateNormal];
   [_primaryButton setImage:nil forState:UIControlStateNormal];
   [self.view setNeedsLayout];
 }
 
 - (void)enterIdentityPickerState {
   // Reset the selected identity.
   [self setSelectedIdentity:nil];
 
   // Add the account selector view controller.
-  _accountSelectorVC.reset([[SigninAccountSelectorViewController alloc] init]);
-  _accountSelectorVC.get().delegate = self;
+  _accountSelectorVC = [[SigninAccountSelectorViewController alloc] init];
+  _accountSelectorVC.delegate = self;
   [_accountSelectorVC willMoveToParentViewController:self];
   [self addChildViewController:_accountSelectorVC];
-  _accountSelectorVC.get().view.frame = self.view.bounds;
-  [self.view insertSubview:_accountSelectorVC.get().view
-              belowSubview:_primaryButton];
+  _accountSelectorVC.view.frame = self.view.bounds;
+  [self.view insertSubview:_accountSelectorVC.view belowSubview:_primaryButton];
   [_accountSelectorVC didMoveToParentViewController:self];
 
   // Update the button title.
   [self updatePrimaryButtonTitle];
   [_secondaryButton setTitle:self.skipSigninButtonTitle
                     forState:UIControlStateNormal];
   [self.view setNeedsLayout];
 
   HideButton(_primaryButton);
   HideButton(_secondaryButton);
@@ skipping 14 matching lines @@
 - (void)leaveIdentityPickerState:(AuthenticationState)nextState {
   [UIView animateWithDuration:kAnimationDuration
       animations:^{
         HideButton(_primaryButton);
         HideButton(_secondaryButton);
       }
       completion:^(BOOL finished) {
         [_accountSelectorVC willMoveToParentViewController:nil];
         [[_accountSelectorVC view] removeFromSuperview];
         [_accountSelectorVC removeFromParentViewController];
-        _accountSelectorVC.reset();
+        _accountSelectorVC = nil;
         [self enterState:nextState];
       }];
 }
 
 #pragma mark - SigninPendingState
 
 - (void)enterSigninPendingState {
   [_secondaryButton setTitle:l10n_util::GetNSString(IDS_CANCEL)
                     forState:UIControlStateNormal];
   [self.view setNeedsLayout];
@@ skipping 17 matching lines @@
 
 - (void)leaveSigninPendingState:(AuthenticationState)nextState {
   if (!_pendingStateTimer) {
     // The controller is already leaving the signin pending state, simply update
     // the new state to take into account the last request only.
     _activityIndicatorNextState = nextState;
     return;
   }
 
   _activityIndicatorNextState = nextState;
-  _activityIndicator.get().delegate = self;
+  _activityIndicator.delegate = self;
 
   base::TimeDelta remainingTime =
       base::TimeDelta::FromMilliseconds(kMinimunPendingStateDurationMs) -
       _pendingStateTimer->Elapsed();
   _pendingStateTimer.reset();
 
   if (remainingTime.InMilliseconds() < 0) {
     [_activityIndicator stopAnimating];
   } else {
     // If the signin pending state is too fast, the screen will appear to
     // flicker. Make sure to animate for at least
     // |kMinimunPendingStateDurationMs| milliseconds.
-    base::WeakNSObject<ChromeSigninViewController> weakSelf(self);
+    __weak ChromeSigninViewController* weakSelf = self;
     ProceduralBlock completionBlock = ^{
-      base::scoped_nsobject<ChromeSigninViewController> strongSelf(
-          [weakSelf retain]);
+      ChromeSigninViewController* strongSelf = weakSelf;
       if (!strongSelf)
         return;
-      [strongSelf.get()->_activityIndicator stopAnimating];
-      strongSelf.get()->_leavingPendingStateTimer.reset();
+      [strongSelf->_activityIndicator stopAnimating];
+      strongSelf->_leavingPendingStateTimer.reset();
     };
     _leavingPendingStateTimer.reset(new base::Timer(false, false));
     _leavingPendingStateTimer->Start(FROM_HERE, remainingTime,
-                                     base::BindBlock(completionBlock));
+                                     base::BindBlockArc(completionBlock));
   }
 }
 
 #pragma mark - IdentitySelectedState
 
 - (void)enterIdentitySelectedState {
-  _confirmationVC.reset([[SigninConfirmationViewController alloc]
-      initWithIdentity:self.selectedIdentity]);
-  _confirmationVC.get().delegate = self;
+  _confirmationVC = [[SigninConfirmationViewController alloc]
+      initWithIdentity:self.selectedIdentity];
+  _confirmationVC.delegate = self;
 
   _hasConfirmationScreenReachedBottom = NO;
   [_confirmationVC willMoveToParentViewController:self];
   [self addChildViewController:_confirmationVC];
-  _confirmationVC.get().view.frame = self.view.bounds;
-  [self.view insertSubview:_confirmationVC.get().view
-              belowSubview:_primaryButton];
+  _confirmationVC.view.frame = self.view.bounds;
+  [self.view insertSubview:_confirmationVC.view belowSubview:_primaryButton];
   [_confirmationVC didMoveToParentViewController:self];
 
   [self setSecondaryButtonStyling:_primaryButton];
   NSString* primaryButtonTitle = l10n_util::GetNSString(
       IDS_IOS_ACCOUNT_CONSISTENCY_CONFIRMATION_SCROLL_BUTTON);
   [_primaryButton setTitle:primaryButtonTitle forState:UIControlStateNormal];
   [_primaryButton setImage:[UIImage imageNamed:@"signin_confirmation_more"]
                   forState:UIControlStateNormal];
   NSString* secondaryButtonTitle = l10n_util::GetNSString(
       IDS_IOS_ACCOUNT_CONSISTENCY_CONFIRMATION_UNDO_BUTTON);
@@ skipping 18 matching lines @@
   if (!isSelectedIdentityValid) {
     [self changeToState:IDENTITY_PICKER_STATE];
     return;
   }
 }
 
 - (void)leaveIdentitySelectedState:(AuthenticationState)nextState {
   [_confirmationVC willMoveToParentViewController:nil];
   [[_confirmationVC view] removeFromSuperview];
   [_confirmationVC removeFromParentViewController];
-  _confirmationVC.reset();
+  _confirmationVC = nil;
   [self setPrimaryButtonStyling:_primaryButton];
   HideButton(_primaryButton);
   HideButton(_secondaryButton);
   [self undoSignIn];
   [self enterState:nextState];
 }
 
 #pragma mark - UIViewController
 
 - (void)viewDidLoad {
   [super viewDidLoad];
   self.view.backgroundColor = self.backgroundColor;
 
-  _primaryButton.reset([[MDCFlatButton alloc] init]);
+  _primaryButton = [[MDCFlatButton alloc] init];
   [self setPrimaryButtonStyling:_primaryButton];
   [_primaryButton addTarget:self
                      action:@selector(onPrimaryButtonPressed:)
            forControlEvents:UIControlEventTouchUpInside];
   HideButton(_primaryButton);
   [self.view addSubview:_primaryButton];
 
-  _secondaryButton.reset([[MDCFlatButton alloc] init]);
+  _secondaryButton = [[MDCFlatButton alloc] init];
   [self setSecondaryButtonStyling:_secondaryButton];
   [_secondaryButton addTarget:self
                        action:@selector(onSecondaryButtonPressed:)
              forControlEvents:UIControlEventTouchUpInside];
   [_secondaryButton setAccessibilityIdentifier:@"ic_close"];
   HideButton(_secondaryButton);
   [self.view addSubview:_secondaryButton];
 
-  _activityIndicator.reset(
-      [[MDCActivityIndicator alloc] initWithFrame:CGRectZero]);
+  _activityIndicator = [[MDCActivityIndicator alloc] initWithFrame:CGRectZero];
   [_activityIndicator setDelegate:self];
   [_activityIndicator setStrokeWidth:3];
   [_activityIndicator
       setCycleColors:@[ [[MDCPalette cr_bluePalette] tint500] ]];
   [self.view addSubview:_activityIndicator];
 
-  _gradientView.reset([[UIView alloc] initWithFrame:CGRectZero]);
-  _gradientLayer.reset([[CAGradientLayer layer] retain]);
+  _gradientView = [[UIView alloc] initWithFrame:CGRectZero];
+  _gradientLayer = [CAGradientLayer layer];
   [_gradientView setUserInteractionEnabled:NO];
-  _gradientLayer.get().colors = [NSArray
+  _gradientLayer.colors = [NSArray
       arrayWithObjects:(id)[[UIColor colorWithWhite:1 alpha:0] CGColor],
                        (id)[self.backgroundColor CGColor], nil];
   [[_gradientView layer] insertSublayer:_gradientLayer atIndex:0];
   [self.view addSubview:_gradientView];
 }
 
 - (void)viewWillAppear:(BOOL)animated {
   [super viewWillAppear:animated];
 
   if (_currentState != NULL_STATE) {
@@ skipping 105 matching lines @@
       UIUserInterfaceSizeClassRegular) {
     constants = kRegularConstants;
   } else {
     constants = kCompactConstants;
   }
 
   [self layoutButtons:constants];
 
   CGSize viewSize = self.view.bounds.size;
   CGFloat collectionViewHeight = viewSize.height -
-                                 _primaryButton.get().frame.size.height -
+                                 _primaryButton.frame.size.height -
                                  constants.ButtonVerticalPadding;
   CGRect collectionViewFrame =
       CGRectMake(0, 0, viewSize.width, collectionViewHeight);
-  [_accountSelectorVC.get().view setFrame:collectionViewFrame];
-  [_confirmationVC.get().view setFrame:collectionViewFrame];
+  [_accountSelectorVC.view setFrame:collectionViewFrame];
+  [_confirmationVC.view setFrame:collectionViewFrame];
 
   // Layout the gradient view right above the buttons.
   CGFloat gradientOriginY = CGRectGetHeight(self.view.bounds) -
                             constants.ButtonVerticalPadding -
                             constants.ButtonHeight - constants.GradientHeight;
   [_gradientView setFrame:CGRectMake(0, gradientOriginY, viewSize.width,
                                      constants.GradientHeight)];
   [_gradientLayer setFrame:[_gradientView bounds]];
 
   // Layout the activity indicator in the center of the view.
@@ skipping 86 matching lines @@
   [self openAuthenticationDialogAddIdentity];
 }
 
 #pragma mark - SigninConfirmationViewControllerDelegate
 
 // Callback for when a link in the label is pressed.
 - (void)signinConfirmationControllerDidTapSettingsLink:
     (SigninConfirmationViewController*)controller {
   DCHECK_EQ(_confirmationVC, controller);
 
-  base::scoped_nsobject<GenericChromeCommand> command(
-      [[GenericChromeCommand alloc] initWithTag:IDC_SHOW_ACCOUNTS_SETTINGS]);
+  GenericChromeCommand* command =
+      [[GenericChromeCommand alloc] initWithTag:IDC_SHOW_ACCOUNTS_SETTINGS];
   [self acceptSignInAndExecuteCommand:command];
 }
 
 - (void)signinConfirmationControllerDidReachBottom:
     (SigninConfirmationViewController*)controller {
   if (_hasConfirmationScreenReachedBottom) {
     return;
   }
   _hasConfirmationScreenReachedBottom = YES;
   [self setPrimaryButtonStyling:_primaryButton];
   [_primaryButton setTitle:[self acceptSigninButtonTitle]
                   forState:UIControlStateNormal];
   [_primaryButton setImage:nil forState:UIControlStateNormal];
   [self.view setNeedsLayout];
 }
 
 @end