diff --git a/android/java/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java b/android/java/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java index e6b855f5752..399bad8dd26 100644 --- a/android/java/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java +++ b/android/java/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java @@ -36,8 +36,8 @@ import org.chromium.build.annotations.Initializer; import org.chromium.build.annotations.NullMarked; import org.chromium.build.annotations.Nullable; import org.chromium.chrome.R; +import org.chromium.chrome.browser.password_manager.BravePasswordManagerHelper; import org.chromium.chrome.browser.password_manager.ManagePasswordsReferrer; -import org.chromium.chrome.browser.password_manager.PasswordManagerHelper; import org.chromium.chrome.browser.preferences.Pref; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.settings.ChromeBaseSettingsFragment; @@ -163,14 +163,14 @@ public class PasswordSettings extends ChromeBaseSettingsFragment @Nullable Bundle savedInstanceState) { if (savedInstanceState != null && savedInstanceState.containsKey( - PasswordManagerHelper.MANAGE_PASSWORDS_REFERRER)) { - return savedInstanceState.getInt(PasswordManagerHelper.MANAGE_PASSWORDS_REFERRER); + BravePasswordManagerHelper.MANAGE_PASSWORDS_REFERRER)) { + return savedInstanceState.getInt(BravePasswordManagerHelper.MANAGE_PASSWORDS_REFERRER); } Bundle extras = getArguments(); - assert extras.containsKey(PasswordManagerHelper.MANAGE_PASSWORDS_REFERRER) + assert extras.containsKey(BravePasswordManagerHelper.MANAGE_PASSWORDS_REFERRER) : "PasswordSettings must be launched with a manage-passwords-referrer fragment" + "argument, but none was provided."; - return extras.getInt(PasswordManagerHelper.MANAGE_PASSWORDS_REFERRER); + return extras.getInt(BravePasswordManagerHelper.MANAGE_PASSWORDS_REFERRER); } @Override @@ -454,7 +454,8 @@ public class PasswordSettings extends ChromeBaseSettingsFragment if (mSearchQuery != null) { outState.putString(SAVED_STATE_SEARCH_QUERY, mSearchQuery); } - outState.putInt(PasswordManagerHelper.MANAGE_PASSWORDS_REFERRER, mManagePasswordsReferrer); + outState.putInt( + BravePasswordManagerHelper.MANAGE_PASSWORDS_REFERRER, mManagePasswordsReferrer); } @Override diff --git a/android/javatests/org/chromium/chrome/browser/password_manager/settings/BravePasswordSettingsTest.java b/android/javatests/org/chromium/chrome/browser/password_manager/settings/BravePasswordSettingsTest.java index 572ed1069a0..8559e9d8824 100644 --- a/android/javatests/org/chromium/chrome/browser/password_manager/settings/BravePasswordSettingsTest.java +++ b/android/javatests/org/chromium/chrome/browser/password_manager/settings/BravePasswordSettingsTest.java @@ -17,8 +17,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.chromium.base.test.util.Batch; +import org.chromium.chrome.browser.password_manager.BravePasswordManagerHelper; import org.chromium.chrome.browser.password_manager.ManagePasswordsReferrer; -import org.chromium.chrome.browser.password_manager.PasswordManagerHelper; import org.chromium.chrome.browser.settings.SettingsActivityTestRule; import org.chromium.chrome.test.ChromeJUnit4ClassRunner; @@ -36,7 +36,8 @@ public class BravePasswordSettingsTest { @Before public void setUp() throws Exception { Bundle fragmentArgs = new Bundle(); - fragmentArgs.putInt(PasswordManagerHelper.MANAGE_PASSWORDS_REFERRER, + fragmentArgs.putInt( + BravePasswordManagerHelper.MANAGE_PASSWORDS_REFERRER, ManagePasswordsReferrer.CHROME_SETTINGS); mSettingsActivityTestRule.startSettingsActivity(fragmentArgs); mSavePasswordPreferences = mSettingsActivityTestRule.getFragment(); diff --git a/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/BravePasswordManagerHelper.java b/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/BravePasswordManagerHelper.java index 6af225cb551..cf0962b5891 100644 --- a/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/BravePasswordManagerHelper.java +++ b/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/BravePasswordManagerHelper.java @@ -23,6 +23,11 @@ public class BravePasswordManagerHelper extends PasswordManagerHelper { private static final String TAG = "BravePasswords"; protected static @Nullable ProfileKeyedMap sProfileMap; + // Key for the argument with which PasswordsSettings will be launched. The value for + // this argument should be part of the ManagePasswordsReferrer enum, which contains + // all points of entry to the passwords settings. + public static final String MANAGE_PASSWORDS_REFERRER = "manage-passwords-referrer"; + BravePasswordManagerHelper(Profile profile) { super(profile); }