[Passwords] Report |DID_NOTHING| in automatic change metrics

Bug: 1132230
Change-Id: Ibae4da2522b4df619ad0848217cf3382b35c81f2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2438454
Commit-Queue: Maxim Kolosovskiy  <kolos@chromium.org>
Reviewed-by: Friedrich [CET] <fhorschig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#812622}

chrome/browser/password_check/android/internal/java/src/org/chromium/chrome/browser/password_check/PasswordCheckCoordinator.java

@@ -103,6 +103,7 @@ class PasswordCheckCoordinator implements PasswordCheckComponentUi, LifecycleObs
 
     @Override
     public void onResumeFragment() {
+        mMediator.onResumeFragment();
         mReauthenticationHelper.onReauthenticationMaybeHappened();
     }
 
@@ -110,6 +111,8 @@ class PasswordCheckCoordinator implements PasswordCheckComponentUi, LifecycleObs
     public void onDestroyFragment() {
         mMediator.stopCheck();
         if (mFragmentView.getActivity() == null || mFragmentView.getActivity().isFinishing()) {
+            mMediator
+                    .onUserLeavesCheckPage(); // Should be called only if the activity is finishing.
             mMediator.destroy();
             mModel = null;
         }

chrome/browser/password_check/android/internal/java/src/org/chromium/chrome/browser/password_check/PasswordCheckMediator.java

@@ -59,6 +59,7 @@ class PasswordCheckMediator
     private HashSet<CompromisedCredential> mPreCheckSet;
     private final PasswordCheckIconHelper mIconHelper;
     private long mLastStatusUpdate;
+    private boolean mCctIsOpened;
 
     PasswordCheckMediator(PasswordCheckChangePasswordHelper changePasswordDelegate,
             PasswordCheckReauthenticationHelper reauthenticationHelper,
@@ -73,6 +74,7 @@ class PasswordCheckMediator
         mModel = model;
         mDelegate = delegate;
         mLaunchCheckupInAccount = launchCheckupInAccount;
+        mCctIsOpened = false;
 
         PasswordCheckMetricsRecorder.recordPasswordCheckReferrer(passwordCheckReferrer);
 
@@ -89,8 +91,27 @@ class PasswordCheckMediator
         }
     }
 
+    void onResumeFragment() {
+        // If the fragment is resumed, a CCT is closed.
+        mCctIsOpened = false;
+    }
+
+    void onUserLeavesCheckPage() {
+        // A user can leave the page because they opened a CCT in browser. As a user is fixing a
+        // compromised credential, don't count such a case as a user |DID_NOTHING| for the remaining
+        // credentials.
+        if (!mCctIsOpened) {
+            // A user closes the check page.
+            ListModel<ListItem> items = mModel.get(ITEMS);
+            for (int i = 1; i < items.size(); i++) {
+                PasswordCheckMetricsRecorder.recordCheckResolutionAction(
+                        PasswordCheckResolutionAction.DID_NOTHING,
+                        items.get(i).model.get(COMPROMISED_CREDENTIAL));
+            }
+        }
+    }
+
     void destroy() {
-        // TODO(crbug.com/): Report PasswordCheckResolutionAction.DID_NOTHING.
         getPasswordCheck().removeObserver(this);
     }
 
@@ -282,6 +303,7 @@ class PasswordCheckMediator
                         : PasswordCheckUserAction.CHANGE_PASSWORD);
         PasswordCheckMetricsRecorder.recordCheckResolutionAction(
                 PasswordCheckResolutionAction.OPENED_SITE, credential);
+        mCctIsOpened = true;
         mChangePasswordDelegate.launchAppOrCctWithChangePasswordUrl(credential);
     }
 
@@ -292,6 +314,7 @@ class PasswordCheckMediator
                 PasswordCheckUserAction.CHANGE_PASSWORD_AUTOMATICALLY);
         PasswordCheckMetricsRecorder.recordCheckResolutionAction(
                 PasswordCheckResolutionAction.STARTED_SCRIPT, credential);
+        mCctIsOpened = true;
         mChangePasswordDelegate.launchCctWithScript(credential);
     }
 

chrome/browser/password_check/android/junit/src/org/chromium/chrome/browser/password_check/PasswordCheckControllerTest.java

@@ -691,6 +691,92 @@ public class PasswordCheckControllerTest {
                 is(1));
     }
 
+    @Test
+    public void testRecordsDidNothingOnLeavingPage() {
+        when(mPasswordCheck.getCompromisedCredentials())
+                .thenReturn(new CompromisedCredential[] {ANA, BOB, CHARLIE});
+        when(mPasswordCheck.areScriptsRefreshed()).thenReturn(true);
+        when(mChangePasswordDelegate.canManuallyChangeCredential(any(CompromisedCredential.class)))
+                .thenReturn(true);
+
+        mMediator.onPasswordCheckStatusChanged(IDLE);
+        mMediator.onCompromisedCredentialsFetchCompleted();
+
+        mMediator.onUserLeavesCheckPage();
+
+        assertThat(RecordHistogram.getHistogramValueCountForTesting(
+                           PASSWORD_CHECK_RESOLUTION_HISTOGRAM_WITHOUT_AUTO_BUTTON,
+                           PasswordCheckResolutionAction.DID_NOTHING),
+                is(2));
+        assertThat(RecordHistogram.getHistogramValueCountForTesting(
+                           PASSWORD_CHECK_RESOLUTION_HISTOGRAM_WITH_AUTO_BUTTON,
+                           PasswordCheckResolutionAction.DID_NOTHING),
+                is(1));
+        assertThat(RecordHistogram.getHistogramValueCountForTesting(
+                           PASSWORD_CHECK_RESOLUTION_HISTOGRAM_FOR_SCRIPTED_SITES,
+                           PasswordCheckResolutionAction.DID_NOTHING),
+                is(2));
+    }
+
+    @Test
+    public void testDoesntRecordDidNothingOnLeavingPageIfCctIsOpen() {
+        when(mPasswordCheck.getCompromisedCredentials())
+                .thenReturn(new CompromisedCredential[] {ANA, BOB, CHARLIE});
+        when(mPasswordCheck.areScriptsRefreshed()).thenReturn(true);
+        when(mChangePasswordDelegate.canManuallyChangeCredential(any(CompromisedCredential.class)))
+                .thenReturn(true);
+
+        mMediator.onPasswordCheckStatusChanged(IDLE);
+        mMediator.onCompromisedCredentialsFetchCompleted();
+
+        // A user opens a CCT and then open the tab in browser => a user leaves the check page.
+        mMediator.onChangePasswordWithScriptButtonClick(BOB);
+        mMediator.onUserLeavesCheckPage();
+
+        assertThat(RecordHistogram.getHistogramValueCountForTesting(
+                           PASSWORD_CHECK_RESOLUTION_HISTOGRAM_WITHOUT_AUTO_BUTTON,
+                           PasswordCheckResolutionAction.DID_NOTHING),
+                is(0));
+        assertThat(RecordHistogram.getHistogramValueCountForTesting(
+                           PASSWORD_CHECK_RESOLUTION_HISTOGRAM_WITH_AUTO_BUTTON,
+                           PasswordCheckResolutionAction.DID_NOTHING),
+                is(0));
+        assertThat(RecordHistogram.getHistogramValueCountForTesting(
+                           PASSWORD_CHECK_RESOLUTION_HISTOGRAM_FOR_SCRIPTED_SITES,
+                           PasswordCheckResolutionAction.DID_NOTHING),
+                is(0));
+    }
+
+    @Test
+    public void testRecordDidNothingOnLeavingPageIfCctIsClosed() {
+        when(mPasswordCheck.getCompromisedCredentials())
+                .thenReturn(new CompromisedCredential[] {ANA, BOB, CHARLIE});
+        when(mPasswordCheck.areScriptsRefreshed()).thenReturn(true);
+        when(mChangePasswordDelegate.canManuallyChangeCredential(any(CompromisedCredential.class)))
+                .thenReturn(true);
+
+        mMediator.onPasswordCheckStatusChanged(IDLE);
+        mMediator.onCompromisedCredentialsFetchCompleted();
+
+        // A user opens a CCT, closes it, and leaves the password check page.
+        mMediator.onChangePasswordWithScriptButtonClick(BOB);
+        mMediator.onResumeFragment();
+        mMediator.onUserLeavesCheckPage();
+
+        assertThat(RecordHistogram.getHistogramValueCountForTesting(
+                           PASSWORD_CHECK_RESOLUTION_HISTOGRAM_WITHOUT_AUTO_BUTTON,
+                           PasswordCheckResolutionAction.DID_NOTHING),
+                is(2));
+        assertThat(RecordHistogram.getHistogramValueCountForTesting(
+                           PASSWORD_CHECK_RESOLUTION_HISTOGRAM_WITH_AUTO_BUTTON,
+                           PasswordCheckResolutionAction.DID_NOTHING),
+                is(1));
+        assertThat(RecordHistogram.getHistogramValueCountForTesting(
+                           PASSWORD_CHECK_RESOLUTION_HISTOGRAM_FOR_SCRIPTED_SITES,
+                           PasswordCheckResolutionAction.DID_NOTHING),
+                is(2));
+    }
+
     private void assertIdleHeader(MVCListAdapter.ListItem header) {
         assertHeaderTypeWithStatus(header, IDLE);
         assertNull(header.model.get(CHECK_PROGRESS));