[iOS] Adding animated and completion to abort method for AdvancedSigninSettingsCoordinator

Changing -[AdvancedSigninSettingsCoordinator abortWithDismiss:] to
-[AdvancedSigninSettingsCoordinator abortWithDismiss:animated:completion:]
This is to prepare the main controller to dismiss the SigninInteractionCoordinator.

Related to: http://go/open-url-unity-project

See: crrev.com/c/1621136

Bug: 965463
Change-Id: Idd560498c544a9165a59274f41239fa9c968fd21
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1621172
Commit-Queue: Jérôme Lebel <jlebel@chromium.org>
Reviewed-by: Gauthier Ambard <gambard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#662569}

ios/chrome/browser/ui/settings/google_services/advanced_signin_settings_coordinator.h

@@ -5,6 +5,7 @@
 #ifndef IOS_CHROME_BROWSER_UI_SETTINGS_GOOGLE_SERVICES_ADVANCED_SIGNIN_SETTINGS_COORDINATOR_H_
 #define IOS_CHROME_BROWSER_UI_SETTINGS_GOOGLE_SERVICES_ADVANCED_SIGNIN_SETTINGS_COORDINATOR_H_
 
+#import "base/ios/block_types.h"
 #import "ios/chrome/browser/ui/coordinators/chrome_coordinator.h"
 
 @class AdvancedSigninSettingsCoordinator;
@@ -42,7 +43,13 @@ extern NSString* const kSyncSettingsCancelButtonId;
 // sync settings doesn't sign out the user. The sync is left unsetup and doesn't
 // start. This method does nothing if called twice.
 // |dismiss|, dismisses the view controller if YES.
-- (void)abortWithDismiss:(BOOL)dismiss;
+// |animated|, the view is animated if YES.
+// |completion|, this completion block is called after the view is dismissed.
+//               It will be called even the view is already dismissed. The value
+//               can be nil.
+- (void)abortWithDismiss:(BOOL)dismiss
+                animated:(BOOL)animated
+              completion:(ProceduralBlock)completion;
 
 @end
 

ios/chrome/browser/ui/settings/google_services/advanced_signin_settings_coordinator.mm

@@ -87,18 +87,28 @@ typedef NS_ENUM(NSInteger, AdvancedSigninSettingsCoordinatorResult) {
                  completion:nil];
 }
 
-- (void)abortWithDismiss:(BOOL)dismiss {
+- (void)abortWithDismiss:(BOOL)dismiss
+                animated:(BOOL)animated
+              completion:(ProceduralBlock)completion {
   if (!self.advancedSigninSettingsNavigationController) {
+    if (completion) {
+      completion();
+    }
     return;
   }
   DCHECK_EQ(self.advancedSigninSettingsNavigationController,
             self.baseViewController.presentedViewController);
   if (dismiss) {
     [self dismissViewControllerAndFinishWithResult:
-              AdvancedSigninSettingsCoordinatorResultInterrupted];
+              AdvancedSigninSettingsCoordinatorResultInterrupted
+                                          animated:animated
+                                        completion:completion];
   } else {
     [self
         finishedWithResult:AdvancedSigninSettingsCoordinatorResultInterrupted];
+    if (completion) {
+      completion();
+    }
   }
 }
 
@@ -212,7 +222,9 @@ typedef NS_ENUM(NSInteger, AdvancedSigninSettingsCoordinatorResult) {
   DCHECK_EQ(self.advancedSigninSettingsNavigationController,
             self.baseViewController.presentedViewController);
   [self dismissViewControllerAndFinishWithResult:
-            AdvancedSyncSettingsCoordinatorResultConfirm];
+            AdvancedSyncSettingsCoordinatorResultConfirm
+                                        animated:YES
+                                      completion:nil];
 }
 
 // Called when a button of |self.cancelConfirmationAlertCoordinator| is pressed.
@@ -222,7 +234,9 @@ typedef NS_ENUM(NSInteger, AdvancedSigninSettingsCoordinatorResult) {
   self.cancelConfirmationAlertCoordinator = nil;
   if (cancelSync) {
     [self dismissViewControllerAndFinishWithResult:
-              AdvancedSigninSettingsCoordinatorResultCancel];
+              AdvancedSigninSettingsCoordinatorResultCancel
+                                          animated:YES
+                                        completion:nil];
   } else {
     base::RecordAction(base::UserMetricsAction(
         "Signin_Signin_CancelCancelAdvancedSyncSettings"));
@@ -232,14 +246,20 @@ typedef NS_ENUM(NSInteger, AdvancedSigninSettingsCoordinatorResult) {
 // Dismisses the current view controller with animation, and calls
 // -[self finishedWithResult:] with |result|.
 - (void)dismissViewControllerAndFinishWithResult:
-    (AdvancedSigninSettingsCoordinatorResult)result {
+            (AdvancedSigninSettingsCoordinatorResult)result
+                                        animated:(BOOL)animated
+                                      completion:(ProceduralBlock)completion {
   DCHECK_EQ(self.advancedSigninSettingsNavigationController,
             self.baseViewController.presentedViewController);
-  [self.baseViewController
-      dismissViewControllerAnimated:YES
-                         completion:^{
-                           [self finishedWithResult:result];
-                         }];
+  __weak __typeof(self) weakSelf = self;
+  ProceduralBlock dismissCompletion = ^() {
+    [weakSelf finishedWithResult:result];
+    if (completion) {
+      completion();
+    }
+  };
+  [self.baseViewController dismissViewControllerAnimated:animated
+                                              completion:dismissCompletion];
 }
 
 @end

ios/chrome/browser/ui/signin_interaction/signin_interaction_coordinator.mm

@@ -118,12 +118,16 @@
 
 - (void)cancel {
   [self.controller cancel];
-  [self.advancedSigninSettingsCoordinator abortWithDismiss:NO];
+  [self.advancedSigninSettingsCoordinator abortWithDismiss:NO
+                                                  animated:YES
+                                                completion:nil];
 }
 
 - (void)cancelAndDismiss {
   [self.controller cancelAndDismiss];
-  [self.advancedSigninSettingsCoordinator abortWithDismiss:YES];
+  [self.advancedSigninSettingsCoordinator abortWithDismiss:YES
+                                                  animated:YES
+                                                completion:nil];
 }
 
 - (BOOL)isActive {