[Signin][Android] Adjust naming style in account picker bottom sheet

This CL renames some account picker bottom sheet tests to make all
test names consistent and put the if branch in the account picker
view binder in to the nest to make the view binding if branches
more consistent.

Bug: 1106442
Change-Id: I33b84a7bca0513ce443b63c3bcd2895031de003b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2308418
Commit-Queue: Alice Wang <aliceywang@chromium.org>
Reviewed-by: Alex Ilin <alexilin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#790413}

chrome/android/java/src/org/chromium/chrome/browser/signin/account_picker/AccountPickerBottomSheetViewBinder.java

@@ -26,14 +26,15 @@ class AccountPickerBottomSheetViewBinder {
                         model.get(AccountPickerBottomSheetProperties.SELECTED_ACCOUNT_DATA) != null;
                 view.collapseAccountList(isSelectedAccountNonNull);
             }
-        } else if (propertyKey == AccountPickerBottomSheetProperties.SELECTED_ACCOUNT_DATA
-                && !model.get(AccountPickerBottomSheetProperties.IS_ACCOUNT_LIST_EXPANDED)) {
-            // Selected account data (which can be null) is only updated
-            // when the account list is collapsed.
-            DisplayableProfileData profileData =
-                    model.get(AccountPickerBottomSheetProperties.SELECTED_ACCOUNT_DATA);
-            view.collapseAccountList(profileData != null);
-            view.updateCollapsedAccountList(profileData);
+        } else if (propertyKey == AccountPickerBottomSheetProperties.SELECTED_ACCOUNT_DATA) {
+            if (!model.get(AccountPickerBottomSheetProperties.IS_ACCOUNT_LIST_EXPANDED)) {
+                // Selected account data (which can be null) is only updated
+                // when the account list is collapsed.
+                DisplayableProfileData profileData =
+                        model.get(AccountPickerBottomSheetProperties.SELECTED_ACCOUNT_DATA);
+                view.collapseAccountList(profileData != null);
+                view.updateCollapsedAccountList(profileData);
+            }
         } else if (propertyKey == AccountPickerBottomSheetProperties.ON_CONTINUE_AS_CLICKED) {
             view.getContinueAsButton().setOnClickListener(v -> {
                 model.get(AccountPickerBottomSheetProperties.ON_CONTINUE_AS_CLICKED).run();

chrome/android/javatests/src/org/chromium/chrome/browser/signin/AccountPickerBottomSheetTest.java

@@ -166,7 +166,7 @@ public class AccountPickerBottomSheetTest {
 
     @Test
     @MediumTest
-    public void testAccountDisappearedInCollapsedSheet() {
+    public void testAccountDisappearedOnCollapsedSheet() {
         buildAndShowCollapsedBottomSheet();
         mAccountManagerTestRule.removeAccountAndWaitForSeeding(PROFILE_DATA1.getAccountName());
         mAccountManagerTestRule.removeAccountAndWaitForSeeding(PROFILE_DATA2.getAccountName());
@@ -176,7 +176,7 @@ public class AccountPickerBottomSheetTest {
 
     @Test
     @MediumTest
-    public void testAccountDisappearedInExpandedSheet() {
+    public void testAccountDisappearedOnExpandedSheet() {
         buildAndShowExpandedBottomSheet();
         mAccountManagerTestRule.removeAccountAndWaitForSeeding(PROFILE_DATA1.getAccountName());
         mAccountManagerTestRule.removeAccountAndWaitForSeeding(PROFILE_DATA2.getAccountName());
@@ -186,7 +186,7 @@ public class AccountPickerBottomSheetTest {
 
     @Test
     @MediumTest
-    public void testAccountReappearedInCollapsedSheet() {
+    public void testAccountReappearedOnCollapsedSheet() {
         mAccountManagerTestRule.removeAccountAndWaitForSeeding(PROFILE_DATA1.getAccountName());
         mAccountManagerTestRule.removeAccountAndWaitForSeeding(PROFILE_DATA2.getAccountName());
         buildAndShowCollapsedBottomSheet();
@@ -199,7 +199,7 @@ public class AccountPickerBottomSheetTest {
 
     @Test
     @MediumTest
-    public void testOtherAccountsChangeInCollapsedSheet() {
+    public void testOtherAccountsChangeOnCollapsedSheet() {
         buildAndShowCollapsedBottomSheet();
         checkCollapsedAccountList(PROFILE_DATA1);
         mAccountManagerTestRule.removeAccountAndWaitForSeeding(PROFILE_DATA2.getAccountName());
@@ -209,7 +209,7 @@ public class AccountPickerBottomSheetTest {
 
     @Test
     @MediumTest
-    public void testSelectedAccountChangeInCollapsedSheet() {
+    public void testSelectedAccountChangeOnCollapsedSheet() {
         buildAndShowCollapsedBottomSheet();
         mAccountManagerTestRule.removeAccountAndWaitForSeeding(PROFILE_DATA1.getAccountName());
         InstrumentationRegistry.getInstrumentation().waitForIdleSync();
@@ -218,7 +218,7 @@ public class AccountPickerBottomSheetTest {
 
     @Test
     @MediumTest
-    public void testProfileDataUpdateInExpandedSheet() {
+    public void testProfileDataUpdateOnExpandedSheet() {
         buildAndShowExpandedBottomSheet();
         String newFullName = "New Full Name1";
         String newGivenName = "New Given Name1";