[Android] Extract lengthy callback in AccountSigninView into method

This CL extracts two lengthy (8 and 57 lines) callbacks into a single method
and renames affected methods.

Bug: None
Change-Id: I712116269eef394c1582263d0a2d24e16fdedfe8
Reviewed-on: https://chromium-review.googlesource.com/591652Reviewed-by: Peter Conn <peconn@chromium.org>
Commit-Queue: Boris Sazonov <bsazonov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#490771}

chrome/android/java/src/org/chromium/chrome/browser/signin/AccountSigninView.java

@@ -196,7 +196,7 @@ public class AccountSigninView extends FrameLayout {
         mDelegate = delegate;
         mListener = listener;
         showConfirmSigninPageAccountTrackerServiceCheck(accountName, isDefaultAccount);
-        updateAccounts();
+        triggerUpdateAccounts();
     }
 
     private void setProfileDataCache(ProfileDataCache profileData) {
@@ -242,7 +242,7 @@ public class AccountSigninView extends FrameLayout {
     @Override
     protected void onAttachedToWindow() {
         super.onAttachedToWindow();
-        updateAccounts();
+        triggerUpdateAccounts();
         if (mProfileData != null) {
             mProfileData.addObserver(mProfileDataCacheObserver);
         }
@@ -260,7 +260,7 @@ public class AccountSigninView extends FrameLayout {
     public void onWindowVisibilityChanged(int visibility) {
         super.onWindowVisibilityChanged(visibility);
         if (visibility == View.VISIBLE) {
-            updateAccounts();
+            triggerUpdateAccounts();
             return;
         }
         if (visibility == View.INVISIBLE && mGooglePlayServicesUpdateErrorHandler != null) {
@@ -292,32 +292,21 @@ public class AccountSigninView extends FrameLayout {
     /**
      * Refresh the list of available system accounts asynchronously.
      */
-    private void updateAccounts() {
+    private void triggerUpdateAccounts() {
         if (mProfileData == null) {
             return;
         }
 
-        if (mSelectedAccountName != null) {
-            AccountManagerFacade.get().tryGetGoogleAccountNames(new Callback<List<String>>() {
+        AccountManagerFacade.get().getGoogleAccountNames(
+                new Callback<AccountManagerResult<List<String>>>() {
                     @Override
-                public void onResult(List<String> result) {
-                    if (result.contains(mSelectedAccountName)) return;
-
-                    if (mUndoBehavior == UNDO_BACK_TO_SELECTION) {
-                        RecordUserAction.record("Signin_Undo_Signin");
-                        showSigninPage();
-                    } else {
-                        mListener.onFailedToSetForcedAccount(mSelectedAccountName);
-                    }
+                    public void onResult(AccountManagerResult<List<String>> result) {
+                        updateAccounts(result);
                     }
                 });
-            return;
     }
 
-        AccountManagerFacade accountManager = AccountManagerFacade.get();
-        accountManager.getGoogleAccountNames(new Callback<AccountManagerResult<List<String>>>() {
-            @Override
-            public void onResult(AccountManagerResult<List<String>> result) {
+    private void updateAccounts(AccountManagerResult<List<String>> result) {
         if (!ViewCompat.isAttachedToWindow(AccountSigninView.this)) {
             // This callback is invoked after AccountSigninView is detached from window
             // (e.g., Chrome is minimized). Updating view now is redundant and dangerous
@@ -325,9 +314,9 @@ public class AccountSigninView extends FrameLayout {
             return;
         }
 
-                List<String> oldAccountNames = mAccountNames;
+        final List<String> accountNames;
         try {
-                    mAccountNames = result.get();
+            accountNames = result.get();
         } catch (GmsAvailabilityException e) {
             dismissGmsUpdatingDialog();
             showGmsErrorDialog(e.getGmsAvailabilityReturnCode());
@@ -346,11 +335,20 @@ public class AccountSigninView extends FrameLayout {
         dismissGmsUpdatingDialog();
 
         if (mSelectedAccountName != null) {
-                    // If sign-in completed in the mean time, return in order to avoid showing the
-                    // wrong state in the UI.
+            if (accountNames.contains(mSelectedAccountName)) return;
+
+            if (mUndoBehavior == UNDO_BACK_TO_SELECTION) {
+                RecordUserAction.record("Signin_Undo_Signin");
+                showSigninPage();
+            } else {
+                mListener.onFailedToSetForcedAccount(mSelectedAccountName);
+            }
             return;
         }
 
+        List<String> oldAccountNames = mAccountNames;
+        mAccountNames = accountNames;
+
         int oldSelectedAccount = mSigninChooseView.getSelectedAccountPosition();
         AccountSelectionResult selection = selectAccountAfterAccountsUpdate(
                 oldAccountNames, mAccountNames, oldSelectedAccount);
@@ -361,8 +359,7 @@ public class AccountSigninView extends FrameLayout {
         setUpSigninButton(!mAccountNames.isEmpty());
         mProfileData.update(mAccountNames);
 
-                boolean selectedAccountChanged = oldAccountNames != null
-                        && !oldAccountNames.isEmpty()
+        boolean selectedAccountChanged = oldAccountNames != null && !oldAccountNames.isEmpty()
                 && (mAccountNames.isEmpty()
                            || mAccountNames.get(accountToSelect)
                                       .equals(oldAccountNames.get(oldSelectedAccount)));
@@ -376,8 +373,6 @@ public class AccountSigninView extends FrameLayout {
             showConfirmSigninPageAccountTrackerServiceCheck();
         }
     }
-        });
-    }
 
     private boolean hasGmsError() {
         return mGooglePlayServicesUpdateErrorHandler != null || mGmsIsUpdatingDialog != null;
@@ -496,7 +491,7 @@ public class AccountSigninView extends FrameLayout {
         mSigninChooseView.setVisibility(View.VISIBLE);
 
         setUpCancelButton();
-        updateAccounts();
+        triggerUpdateAccounts();
     }
 
     private void showConfirmSigninPage() {