Deselect disabled item for ItemChooserDialog on Android

chrome/android/javatests/src/org/chromium/chrome/browser/ItemChooserDialogTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/ItemChooserDialogTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/ItemChooserDialogTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/ItemChooserDialogTest.java
index 366b10dccc823f2de83ba843fea74e5cf8c48888..c612e00a87f9287b67bc71a780f6db3d5ccbfab9 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/ItemChooserDialogTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/ItemChooserDialogTest.java
@@ -204,6 +204,28 @@ public class ItemChooserDialogTest extends ChromeActivityTestCaseBase<ChromeActi
     }
 
     @LargeTest
+    public void testSelectOneItemThenDisableTheSelectedItem() {
+        Dialog dialog = mChooserDialog.getDialogForTesting();
+        assertTrue(dialog.isShowing());
+
+        ItemChooserDialog.ItemAdapter itemAdapter = mChooserDialog.getItemAdapterForTesting();
+
+        mChooserDialog.addOrUpdateItem("key1", "desc1");
+        mChooserDialog.addOrUpdateItem("key2", "desc2");
+
+        selectItem(dialog, 1, "key1", true);
+        assertEquals("key1", itemAdapter.getSelectedItemKey());
+        mChooserDialog.setEnabled("key1", false);
+        // The selected item is disabled, so no item is selected.
+        assertEquals("", itemAdapter.getSelectedItemKey());
+        mChooserDialog.setEnabled("key1", true);
+        // The disabled item is not automatically selected again when it is re-enabled.
+        assertEquals("", itemAdapter.getSelectedItemKey());
+
+        mChooserDialog.dismiss();
+    }
+
+    @LargeTest
     public void testPairButtonDisabledOrEnabledAfterSelectedItemDisabledOrEnabled() {
         Dialog dialog = mChooserDialog.getDialogForTesting();
         assertTrue(dialog.isShowing());
@@ -220,7 +242,9 @@ public class ItemChooserDialogTest extends ChromeActivityTestCaseBase<ChromeActi
         assertFalse(button.isEnabled());
 
         mChooserDialog.setEnabled("key1", true);
-        assertTrue(button.isEnabled());
+        // The disabled item is not automatically selected again when it is re-enabled,
+        // so the button is still disabled.
+        assertFalse(button.isEnabled());
 
         mChooserDialog.dismiss();
     }