[PWD Editing Android] Save changes through PasswordEditingDelegateProvider

PasswordEntryEditor saves changes for a credential record when the
Save button is clicked through PasswordEditingDelegateProvider.

Bug: 377410
Change-Id: I200e4702945212b847488835a04fad3e5581b139
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1807308Reviewed-by: Friedrich [CET] <fhorschig@chromium.org>
Commit-Queue: Ivana Zuzic <izuzic@google.com>
Cr-Commit-Position: refs/heads/master@{#698945}

chrome/android/java/src/org/chromium/chrome/browser/preferences/password/PasswordEntryEditor.java

@@ -134,7 +134,10 @@ public class PasswordEntryEditor extends Fragment {
             mPasswordLabel.setError(getContext().getString(
                     R.string.pref_edit_dialog_field_required_validation_message));
         } else {
-            // TODO(crbug.com/377410): Save the changes if everything was ok.
+            PasswordEditingDelegateProvider.getInstance()
+                    .getPasswordEditingDelegate()
+                    .editSavedPasswordEntry(
+                            mUsernameText.getText().toString(), mPasswordText.getText().toString());
             getActivity().finish();
         }
     }
@@ -144,4 +147,10 @@ public class PasswordEntryEditor extends Fragment {
         super.onSaveInstanceState(savedInstanceState);
         savedInstanceState.putBoolean(VIEW_BUTTON_PRESSED, mViewButtonPressed);
     }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        PasswordEditingDelegateProvider.getInstance().getPasswordEditingDelegate().destroy();
+    }
 }
\ No newline at end of file

chrome/android/java/src/org/chromium/chrome/browser/preferences/password/PasswordEntryViewer.java

@@ -199,6 +199,9 @@ public class PasswordEntryViewer
             if (mCopyButtonPressed) copyPassword();
         }
         PasswordManagerHandlerProvider.getInstance().addObserver(this);
+        PasswordManagerHandlerProvider.getInstance()
+                .getPasswordManagerHandler()
+                .updatePasswordLists();
     }
 
     @Override
@@ -434,13 +437,13 @@ public class PasswordEntryViewer
     @Override
     public void passwordListAvailable(int count) {
         if (mException) return;
-        TextView passwordsLinkTextView = mView.findViewById(R.id.passwords_link);
+        TextView passwordTextView = mView.findViewById(R.id.password_entry_viewer_password);
         SavedPasswordEntry SavedPasswordEntry = PasswordManagerHandlerProvider.getInstance()
                                                         .getPasswordManagerHandler()
                                                         .getSavedPasswordEntry(mID);
         setRowText(R.id.url_row, SavedPasswordEntry.getUrl());
         setRowText(R.id.username_row, SavedPasswordEntry.getUserName());
-        passwordsLinkTextView.setText(SavedPasswordEntry.getPassword());
+        passwordTextView.setText(SavedPasswordEntry.getPassword());
     }
 
     @Override

chrome/android/javatests/src/org/chromium/chrome/browser/preferences/password/SavePasswordsPreferencesTest.java

@@ -37,6 +37,8 @@ import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.nullValue;
 import static org.hamcrest.Matchers.sameInstance;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
 
 import static org.chromium.chrome.test.util.ViewUtils.VIEW_GONE;
 import static org.chromium.chrome.test.util.ViewUtils.VIEW_INVISIBLE;
@@ -74,17 +76,19 @@ import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 import org.junit.After;
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestRule;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
 
 import org.chromium.base.Callback;
 import org.chromium.base.CollectionUtil;
 import org.chromium.base.IntStringCallback;
 import org.chromium.base.test.BaseJUnit4ClassRunner;
 import org.chromium.base.test.util.Feature;
+import org.chromium.base.test.util.ScalableTimeout;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.history.HistoryActivity;
@@ -101,6 +105,7 @@ import org.chromium.chrome.test.ChromeBrowserTestRule;
 import org.chromium.chrome.test.util.browser.Features;
 import org.chromium.components.signin.ChromeSigninController;
 import org.chromium.components.sync.ModelType;
+import org.chromium.content_public.browser.test.util.CriteriaHelper;
 import org.chromium.content_public.browser.test.util.TestThreadUtils;
 
 import java.io.File;
@@ -119,6 +124,9 @@ import java.util.concurrent.atomic.AtomicReference;
 @RunWith(BaseJUnit4ClassRunner.class)
 public class SavePasswordsPreferencesTest {
     private static final long UI_UPDATING_TIMEOUT_MS = 3000;
+    @Mock
+    private PasswordEditingDelegate mMockPasswordEditingDelegate;
+
     @Rule
     public final ChromeBrowserTestRule mBrowserTestRule = new ChromeBrowserTestRule();
 
@@ -225,6 +233,15 @@ public class SavePasswordsPreferencesTest {
         @Override
         public void showPasswordEntryEditingView(Context context, int index) {
             mLastEntryIndex = index;
+            Bundle fragmentArgs = new Bundle();
+            fragmentArgs.putString(
+                    PasswordEntryEditor.CREDENTIAL_URL, getSavedPasswordEntry(index).getUrl());
+            fragmentArgs.putString(PasswordEntryEditor.CREDENTIAL_NAME,
+                    getSavedPasswordEntry(index).getUserName());
+            fragmentArgs.putString(PasswordEntryEditor.CREDENTIAL_PASSWORD,
+                    getSavedPasswordEntry(index).getPassword());
+            PreferencesLauncher.launchSettingsPage(
+                    context, PasswordEntryEditor.class, fragmentArgs);
         }
     }
 
@@ -256,6 +273,10 @@ public class SavePasswordsPreferencesTest {
      */
     private final ManualCallbackDelayer mManualDelayer = new ManualCallbackDelayer();
 
+    public SavePasswordsPreferencesTest() {
+        MockitoAnnotations.initMocks(this);
+    }
+
     private void overrideProfileSyncService(
             final boolean usingPassphrase, final boolean syncingPasswords) {
         TestThreadUtils.runOnUiThreadBlocking(() -> {
@@ -723,6 +744,8 @@ public class SavePasswordsPreferencesTest {
     @Features.EnableFeatures(ChromeFeatureList.PASSWORD_EDITING_ANDROID)
     public void testSelectedStoredPasswordIndexIsSameAsInShowPasswordEntryEditingView()
             throws Exception {
+        PasswordEditingDelegateProvider.getInstance().setPasswordEditingDelegate(
+                mMockPasswordEditingDelegate);
         setPasswordSourceWithMultipleEntries( // Initialize preferences
                 new SavedPasswordEntry[] {new SavedPasswordEntry("https://example.com",
                                                   "example user", "example password"),
@@ -746,6 +769,8 @@ public class SavePasswordsPreferencesTest {
     @Feature({"Preferences"})
     @Features.EnableFeatures(ChromeFeatureList.PASSWORD_EDITING_ANDROID)
     public void testPasswordDataDisplayedInEditingActivity() throws Exception {
+        PasswordEditingDelegateProvider.getInstance().setPasswordEditingDelegate(
+                mMockPasswordEditingDelegate);
         Bundle fragmentArgs = new Bundle();
         fragmentArgs.putString(PasswordEntryEditor.CREDENTIAL_URL, "https://example.com");
         fragmentArgs.putString(PasswordEntryEditor.CREDENTIAL_NAME, "test user");
@@ -759,17 +784,16 @@ public class SavePasswordsPreferencesTest {
     }
 
     /**
-     * Check that the changes of password data in the password editing activity are preserved and
-     * shown in the password viewing activity and in the list of passwords after the save button
-     * was clicked.
+     * Check that the password editing method from the PasswordEditingDelegate was called when the
+     * save button in the password editing activity was clicked.
      */
-    // TODO(izuzic): Remove @Ignore when saving of changes is enabled again.
-    @Ignore("The test is ignored because saving the changes of credentials is currently disabled.")
     @Test
     @SmallTest
     @Feature({"Preferences"})
     @Features.EnableFeatures(ChromeFeatureList.PASSWORD_EDITING_ANDROID)
-    public void testChangeOfStoredPasswordDataIsPreserved() throws Exception {
+    public void testPasswordEditingMethodWasCalled() throws Exception {
+        PasswordEditingDelegateProvider.getInstance().setPasswordEditingDelegate(
+                mMockPasswordEditingDelegate);
         setPasswordSource(new SavedPasswordEntry("https://example.com", "test user", "password"));
 
         PreferencesTest.startPreferences(InstrumentationRegistry.getInstrumentation(),
@@ -783,6 +807,38 @@ public class SavePasswordsPreferencesTest {
 
         Espresso.onView(withSaveMenuIdOrText()).perform(click());
 
+        verify(mMockPasswordEditingDelegate).editSavedPasswordEntry("test user new", "password");
+
+        // Verify that the delegate was destroyed when the password editing activity finished.
+        waitForEvent().destroy();
+    }
+
+    /**
+     * Check that the changes of password data are shown in the password viewing activity and in the
+     * list of passwords after the save button was clicked.
+     */
+    @Test
+    @SmallTest
+    @Feature({"Preferences"})
+    @Features.EnableFeatures(ChromeFeatureList.PASSWORD_EDITING_ANDROID)
+    public void testChangeOfStoredPasswordDataIsPropagated() throws Exception {
+        PasswordEditingDelegateProvider.getInstance().setPasswordEditingDelegate(
+                mMockPasswordEditingDelegate);
+        setPasswordSource(new SavedPasswordEntry("https://example.com", "test user", "password"));
+
+        PreferencesTest.startPreferences(InstrumentationRegistry.getInstrumentation(),
+                SavePasswordsPreferences.class.getName());
+
+        Espresso.onView(withText(containsString("test user"))).perform(click());
+
+        Espresso.onView(withEditMenuIdOrText()).perform(click());
+
+        // Performing a change of saved credentials.
+        mHandler.mSavedPasswords.set(
+                0, new SavedPasswordEntry("https://example.com", "test user new", "password"));
+
+        Espresso.onView(withSaveMenuIdOrText()).perform(click());
+
         // Check if the password viewing activity has the updated data.
         Espresso.onView(withText("test user new")).check(matches(isDisplayed()));
 
@@ -800,6 +856,8 @@ public class SavePasswordsPreferencesTest {
     @Feature({"Preferences"})
     @Features.EnableFeatures(ChromeFeatureList.PASSWORD_EDITING_ANDROID)
     public void testStoredPasswordCanBeUnmaskedAndMaskedAgain() throws Exception {
+        PasswordEditingDelegateProvider.getInstance().setPasswordEditingDelegate(
+                mMockPasswordEditingDelegate);
         Bundle fragmentArgs = new Bundle();
         fragmentArgs.putString(SavePasswordsPreferences.PASSWORD_LIST_NAME, "test user");
         fragmentArgs.putString(SavePasswordsPreferences.PASSWORD_LIST_URL, "https://example.com");
@@ -2137,4 +2195,9 @@ public class SavePasswordsPreferencesTest {
                                 allOf(withId(R.id.search_src_text), withText("Zeu"))));
         Espresso.onView(withId(R.id.search_src_text)).check(matches(withText("Zeu")));
     }
+
+    PasswordEditingDelegate waitForEvent() {
+        return verify(mMockPasswordEditingDelegate,
+                timeout(ScalableTimeout.scaleTimeout(CriteriaHelper.DEFAULT_MAX_TIME_TO_POLL)));
+    }
 }