Adding ChromeIdentity in ShowSigninCommand.

ios/chrome/app/main_controller.mm

 // Copyright 2012 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.
 
 #import "ios/chrome/app/main_controller.h"
 
 #include <memory>
 #include <string>
 
 #import <CoreSpotlight/CoreSpotlight.h>
@@ skipping 369 matching lines @@
 - (void)showSettings;
 // Shows the accounts settings UI.
 - (void)showAccountsSettings;
 // Shows the Sync settings UI.
 - (void)showSyncSettings;
 // Shows the Save Passwords settings.
 - (void)showSavePasswordsSettings;
 // Invokes the sign in flow with the specified authentication operation and
 // invokes |callback| when finished.
 - (void)showSigninWithOperation:(AuthenticationOperation)operation
+                       identity:(ChromeIdentity*)identity
                     accessPoint:(signin_metrics::AccessPoint)accessPoint
                     promoAction:(signin_metrics::PromoAction)promoAction
                        callback:(ShowSigninCommandCompletionCallback)callback;
 // Wraps a callback with one that first checks if sign-in was completed
 // successfully and the profile wasn't swapped before invoking.
 - (ShowSigninCommandCompletionCallback)successfulSigninCompletion:
     (ProceduralBlock)callback;
 // Shows the Sync encryption passphrase (part of Settings).
 - (void)showSyncEncryptionPassphrase;
 // Shows the Native Apps Settings UI (part of Settings).
@@ skipping 1027 matching lines @@
         [self showReportAnIssue];
       });
       break;
     case IDC_SHOW_SIGNIN_IOS: {
       ShowSigninCommand* command =
           base::mac::ObjCCastStrict<ShowSigninCommand>(sender);
       if (command.operation == AUTHENTICATION_OPERATION_DISMISS) {
         [self dismissSigninInteractionController];
       } else {
         [self showSigninWithOperation:command.operation
+                             identity:command.identity
                           accessPoint:command.accessPoint
                           promoAction:command.promoAction
                              callback:command.callback];
       }
       break;
     }
     case IDC_SHOW_ACCOUNTS_SETTINGS: {
       [self showAccountsSettings];
       break;
     }
@@ skipping 626 matching lines @@
   _settingsNavigationController.reset([SettingsNavigationController
       newContextualSearchController:_mainBrowserState
                            delegate:self]);
   [[self topPresentedViewController]
       presentViewController:_settingsNavigationController
                    animated:YES
                  completion:nil];
 }
 
 - (void)showSigninWithOperation:(AuthenticationOperation)operation
+                       identity:(ChromeIdentity*)identity
                     accessPoint:(signin_metrics::AccessPoint)accessPoint
                     promoAction:(signin_metrics::PromoAction)promoAction
                        callback:(ShowSigninCommandCompletionCallback)callback {
   DCHECK_NE(AUTHENTICATION_OPERATION_DISMISS, operation);
 
   if (_signinInteractionController) {
     // Avoid showing the sign in screen if there is already a sign-in operation
     // in progress.
     return;
   }
@@ skipping 16 matching lines @@
     case AUTHENTICATION_OPERATION_DISMISS:
       // Special case handled above.
       NOTREACHED();
       break;
     case AUTHENTICATION_OPERATION_REAUTHENTICATE:
       [_signinInteractionController
           reAuthenticateWithCompletion:completion
                         viewController:self.mainViewController];
       break;
     case AUTHENTICATION_OPERATION_SIGNIN:
+      DCHECK(!identity);

[msarda, 2017/05/16 13:33:53]

Remove this new DCHECK (see comment below).

[jlebel, 2017/05/16 17:55:08]

Done.

       [_signinInteractionController
           signInWithViewController:self.mainViewController
                           identity:nil
                         completion:completion];
       break;
-    case AUTHENTICATION_OPERATION_SIGNIN_PROMO_CONTINUE_AS: {
-      NSArray* identities = ios::GetChromeBrowserProvider()
-                                ->GetChromeIdentityService()
-                                ->GetAllIdentitiesSortedForDisplay();
-      DCHECK(identities.count > 0);
+    case AUTHENTICATION_OPERATION_SIGNIN_PROMO_CONTINUE_AS:

[msarda, 2017/05/16 13:33:53]

I think we should remove AUTHENTICATION_OPERATION_SIGNIN_PROMO_CONTINUE_AS and
just use  AUTHENTICATION_OPERATION_SIGNIN instead.

[jlebel, 2017/05/16 17:55:08]

Done.

+      DCHECK(identity);
       [_signinInteractionController
           signInWithViewController:self.mainViewController
-                          identity:identities[0]
+                          identity:identity
                         completion:completion];
       break;
-    }
   }
 }
 
 - (void)showAddAccount {
   if (_signinInteractionController) {
     // Avoid showing the sign in screen if there is already a sign-in operation
     // in progress.
     return;
   }
 
@@ skipping 484 matching lines @@
   };
 
   callbackCounter->IncrementCount();
   [self removeBrowsingDataFromBrowserState:_mainBrowserState
                                       mask:removeAllMask
                                 timePeriod:browsing_data::TimePeriod::ALL_TIME
                          completionHandler:decrementCallbackCounterCount];
 }
 
 @end