Commit 2a60833b authored by Jeffrey Cohen's avatar Jeffrey Cohen Committed by Chromium LUCI CQ

[Project Code Inclusion] Remove all uses of whitelist/blacklist in...

[Project Code Inclusion] Remove all uses of whitelist/blacklist in chrome/android/.../keyboard_accessory

Bug: 1149543
Change-Id: I333d790ab61033d576e245c0e7ee243461c05aa0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2572687Reviewed-by: default avatarDavid Trainor <dtrainor@chromium.org>
Commit-Queue: Jeffrey Cohen <jeffreycohen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#834325}
parent 2231adae
...@@ -190,9 +190,9 @@ class ManualFillingComponentBridge { ...@@ -190,9 +190,9 @@ class ManualFillingComponentBridge {
@VisibleForTesting @VisibleForTesting
public static void cachePasswordSheetData(WebContents webContents, String[] userNames, public static void cachePasswordSheetData(WebContents webContents, String[] userNames,
String[] passwords, boolean originBlacklisted) { String[] passwords, boolean originDenylisted) {
ManualFillingComponentBridgeJni.get().cachePasswordSheetDataForTesting( ManualFillingComponentBridgeJni.get().cachePasswordSheetDataForTesting(
webContents, userNames, passwords, originBlacklisted); webContents, userNames, passwords, originDenylisted);
} }
@VisibleForTesting @VisibleForTesting
...@@ -237,7 +237,7 @@ class ManualFillingComponentBridge { ...@@ -237,7 +237,7 @@ class ManualFillingComponentBridge {
void onViewDestroyed( void onViewDestroyed(
long nativeManualFillingViewAndroid, ManualFillingComponentBridge caller); long nativeManualFillingViewAndroid, ManualFillingComponentBridge caller);
void cachePasswordSheetDataForTesting(WebContents webContents, String[] userNames, void cachePasswordSheetDataForTesting(WebContents webContents, String[] userNames,
String[] passwords, boolean originBlacklisted); String[] passwords, boolean originDenylisted);
void notifyFocusedFieldTypeForTesting(WebContents webContents, int focusedFieldType); void notifyFocusedFieldTypeForTesting(WebContents webContents, int focusedFieldType);
void signalAutoGenerationStatusForTesting(WebContents webContents, boolean available); void signalAutoGenerationStatusForTesting(WebContents webContents, boolean available);
void disableServerPredictionsForTesting(); void disableServerPredictionsForTesting();
......
...@@ -340,14 +340,13 @@ public class ManualFillingTestHelper { ...@@ -340,14 +340,13 @@ public class ManualFillingTestHelper {
* controller. The controller will only refresh this cache on page load. * controller. The controller will only refresh this cache on page load.
* @param usernames {@link String}s to be used as display text for username chips. * @param usernames {@link String}s to be used as display text for username chips.
* @param passwords {@link String}s to be used as display text for password chips. * @param passwords {@link String}s to be used as display text for password chips.
* @param originBlacklisted boolean indicating whether password saving is disabled for the * @param originDenylisted boolean indicating whether password saving is disabled for the
* origin. * origin.
*/ */
public void cacheCredentials( public void cacheCredentials(String[] usernames, String[] passwords, boolean originDenylisted) {
String[] usernames, String[] passwords, boolean originBlacklisted) {
TestThreadUtils.runOnUiThreadBlocking(() -> { TestThreadUtils.runOnUiThreadBlocking(() -> {
ManualFillingComponentBridge.cachePasswordSheetData( ManualFillingComponentBridge.cachePasswordSheetData(
mActivityTestRule.getWebContents(), usernames, passwords, originBlacklisted); mActivityTestRule.getWebContents(), usernames, passwords, originDenylisted);
}); });
} }
......
...@@ -151,7 +151,7 @@ public class PasswordAccessoryIntegrationTest { ...@@ -151,7 +151,7 @@ public class PasswordAccessoryIntegrationTest {
@EnableFeatures({ChromeFeatureList.RECOVER_FROM_NEVER_SAVE_ANDROID, @EnableFeatures({ChromeFeatureList.RECOVER_FROM_NEVER_SAVE_ANDROID,
ChromeFeatureList.AUTOFILL_KEYBOARD_ACCESSORY}) ChromeFeatureList.AUTOFILL_KEYBOARD_ACCESSORY})
public void public void
testEnablesUnblacklistingToggle() throws TimeoutException { testEnablesUndenylistingToggle() throws TimeoutException {
mHelper.loadTestPage(false); mHelper.loadTestPage(false);
mHelper.cacheCredentials(new String[0], new String[0], true); mHelper.cacheCredentials(new String[0], new String[0], true);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment