[Passwords] Rename |has_script| to |has_auto_change_button|

(in CompromisedCredential*)

has_script is going to be divided into |has_script| and
|has_auto_change_button|. It will be done in several steps for easier
reviewing:
1. The existing |has_script| will be renamed to |has_auto_change_button|
(this CL)
2. A "new" |has_script| will be introduced, where |has_script|==
|has_auto_change_button|.
3. Implement special logic for the new |has_script|.

Bug: 1132230
Change-Id: I684921dc2e4aedaea20ac467c67512915dfa3590
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2429409
Commit-Queue: Maxim Kolosovskiy  <kolos@chromium.org>
Reviewed-by: Ioana Pandele <ioanap@chromium.org>
Cr-Commit-Position: refs/heads/master@{#811181}

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

@@ -64,14 +64,14 @@ class PasswordCheckBridge {
     // TODO(crbug.com/1102025): Add call from native.
     void onCompromisedCredentialFound(String signonRealm, GURL origin, String username,
             String displayOrigin, String displayUsername, String password, String passwordChangeUrl,
-            String associatedApp, long creationTime, boolean hasScript) {
+            String associatedApp, long creationTime, boolean hasAutoChangeButton) {
         assert signonRealm != null;
         assert displayOrigin != null;
         assert username != null;
         assert password != null;
         mPasswordCheckObserver.onCompromisedCredentialFound(new CompromisedCredential(signonRealm,
                 origin, username, displayOrigin, displayUsername, password, passwordChangeUrl,
-                associatedApp, creationTime, true, false, hasScript));
+                associatedApp, creationTime, true, false, hasAutoChangeButton));
     }
 
     @CalledByNative
@@ -98,10 +98,10 @@ class PasswordCheckBridge {
     private static void insertCredential(CompromisedCredential[] credentials, int index,
             String signonRealm, GURL origin, String username, String displayOrigin,
             String displayUsername, String password, String passwordChangeUrl, String associatedApp,
-            long creationTime, boolean leaked, boolean phished, boolean hasScript) {
+            long creationTime, boolean leaked, boolean phished, boolean hasAutoChangeButton) {
         credentials[index] = new CompromisedCredential(signonRealm, origin, username, displayOrigin,
                 displayUsername, password, passwordChangeUrl, associatedApp, creationTime, leaked,
-                phished, hasScript);
+                phished, hasAutoChangeButton);
     }
 
     /**

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

@@ -274,7 +274,7 @@ class PasswordCheckMediator
 
     @Override
     public void onChangePasswordButtonClick(CompromisedCredential credential) {
-        PasswordCheckMetricsRecorder.recordUiUserAction(credential.hasScript()
+        PasswordCheckMetricsRecorder.recordUiUserAction(credential.hasAutoChangeButton()
                         ? PasswordCheckUserAction.CHANGE_PASSWORD_MANUALLY
                         : PasswordCheckUserAction.CHANGE_PASSWORD);
         mChangePasswordDelegate.launchAppOrCctWithChangePasswordUrl(credential);
@@ -282,7 +282,7 @@ class PasswordCheckMediator
 
     @Override
     public void onChangePasswordWithScriptButtonClick(CompromisedCredential credential) {
-        assert credential.hasScript();
+        assert credential.hasAutoChangeButton();
         PasswordCheckMetricsRecorder.recordUiUserAction(
                 PasswordCheckUserAction.CHANGE_PASSWORD_AUTOMATICALLY);
         mChangePasswordDelegate.launchCctWithScript(credential);
@@ -350,7 +350,7 @@ class PasswordCheckMediator
         mIconHelper.getLargeIcon(credential, (faviconOrFallback) -> {
             credentialModel.set(FAVICON_OR_FALLBACK, faviconOrFallback);
         });
-        return new ListItem(credential.hasScript()
+        return new ListItem(credential.hasAutoChangeButton()
                         ? PasswordCheckProperties.ItemType.COMPROMISED_CREDENTIAL_WITH_SCRIPT
                         : PasswordCheckProperties.ItemType.COMPROMISED_CREDENTIAL,
                 credentialModel);

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

@@ -165,7 +165,7 @@ class PasswordCheckViewBinder {
             });
             setTintListForCompoundDrawables(button.getCompoundDrawablesRelative(),
                     view.getContext(), org.chromium.ui.R.color.default_text_color_inverse);
-            if (credential.hasScript()) {
+            if (credential.hasAutoChangeButton()) {
                 ButtonCompat button_with_script =
                         view.findViewById(R.id.credential_change_button_with_script);
                 button_with_script.setOnClickListener(unusedView -> {
@@ -179,7 +179,8 @@ class PasswordCheckViewBinder {
             ButtonCompat button = view.findViewById(R.id.credential_change_button);
             button.setVisibility(model.get(HAS_MANUAL_CHANGE_BUTTON) ? View.VISIBLE : View.GONE);
             TextView changeHint = view.findViewById(R.id.credential_change_hint);
-            changeHint.setVisibility(model.get(HAS_MANUAL_CHANGE_BUTTON) || credential.hasScript()
+            changeHint.setVisibility(
+                    model.get(HAS_MANUAL_CHANGE_BUTTON) || credential.hasAutoChangeButton()
                             ? View.GONE
                             : View.VISIBLE);
         } else if (propertyKey == FAVICON_OR_FALLBACK) {

chrome/browser/password_check/android/java/src/org/chromium/chrome/browser/password_check/CompromisedCredential.java

@@ -35,11 +35,11 @@ public class CompromisedCredential implements Parcelable {
                     in.readBooleanArray(boolArguments);
                     final boolean leaked = boolArguments[0];
                     final boolean phished = boolArguments[1];
-                    final boolean hasScript = boolArguments[2];
+                    final boolean hasAutoChangeButton = boolArguments[2];
 
                     return new CompromisedCredential(signonRealm, origin, username, displayOrigin,
                             displayUsername, password, passwordChangeUrl, associatedApp,
-                            creationTime, leaked, phished, hasScript);
+                            creationTime, leaked, phished, hasAutoChangeButton);
                 }
 
                 @Override
@@ -59,7 +59,7 @@ public class CompromisedCredential implements Parcelable {
     private final long mCreationTime;
     private final boolean mLeaked;
     private final boolean mPhished;
-    private final boolean mHasScript;
+    private final boolean mHasAutoChangeButton;
 
     /**
      * @param signonRealm The URL leading to the sign-on page.
@@ -75,12 +75,12 @@ public class CompromisedCredential implements Parcelable {
      *        time at which the compromised credential was first found to be compromised during
      *        a check.
      * @param phished True iff the credential was entered on an unsafe site.
-     * @param hasScript True iff the credential can be automatically fixed.
+     * @param hasAutoChangeButton True iff the credential can be automatically fixed.
      */
     public CompromisedCredential(String signonRealm, GURL origin, String username,
             String displayOrigin, String displayUsername, String password, String passwordChangeUrl,
             String associatedApp, long creationTime, boolean leaked, boolean phished,
-            boolean hasScript) {
+            boolean hasAutoChangeButton) {
         assert origin != null : "Credential origin is null! Pass an empty one instead.";
         assert signonRealm != null;
         assert passwordChangeUrl != null : "Change URL may be empty but not null!";
@@ -100,7 +100,7 @@ public class CompromisedCredential implements Parcelable {
         mCreationTime = creationTime;
         mLeaked = leaked;
         mPhished = phished;
-        mHasScript = hasScript;
+        mHasAutoChangeButton = hasAutoChangeButton;
     }
 
     @CalledByNative
@@ -140,8 +140,8 @@ public class CompromisedCredential implements Parcelable {
     public boolean isPhished() {
         return mPhished;
     }
-    public boolean hasScript() {
-        return mHasScript;
+    public boolean hasAutoChangeButton() {
+        return mHasAutoChangeButton;
     }
 
     @Override
@@ -156,7 +156,7 @@ public class CompromisedCredential implements Parcelable {
                 && mPasswordChangeUrl.equals(that.mPasswordChangeUrl)
                 && mAssociatedApp.equals(that.mAssociatedApp) && mCreationTime == that.mCreationTime
                 && mLeaked == that.mLeaked && mPhished == that.mPhished
-                && mHasScript == that.mHasScript;
+                && mHasAutoChangeButton == that.mHasAutoChangeButton;
     }
 
     @Override
@@ -167,14 +167,14 @@ public class CompromisedCredential implements Parcelable {
                 + ", displayUsername='" + mDisplayUsername + '\'' + ", password='" + mPassword
                 + '\'' + ", passwordChangeUrl='" + mPasswordChangeUrl + '\'' + ", associatedApp='"
                 + mAssociatedApp + '\'' + ", creationTime=" + mCreationTime + ", leaked=" + mLeaked
-                + ", phished=" + mPhished + ", hasScript=" + mHasScript + '}';
+                + ", phished=" + mPhished + ", hasAutoChangeButton=" + mHasAutoChangeButton + '}';
     }
 
     @Override
     public int hashCode() {
         return Objects.hash(mSignonRealm, mOrigin.getPossiblyInvalidSpec(), mUsername,
                 mDisplayOrigin, mDisplayUsername, mPassword, mPasswordChangeUrl, mAssociatedApp,
-                mCreationTime, mLeaked, mPhished, mHasScript);
+                mCreationTime, mLeaked, mPhished, mHasAutoChangeButton);
     }
 
     @Override
@@ -188,7 +188,7 @@ public class CompromisedCredential implements Parcelable {
         parcel.writeString(mPasswordChangeUrl);
         parcel.writeString(mAssociatedApp);
         parcel.writeLong(mCreationTime);
-        parcel.writeBooleanArray(new boolean[] {mLeaked, mPhished, mHasScript});
+        parcel.writeBooleanArray(new boolean[] {mLeaked, mPhished, mHasAutoChangeButton});
     }
 
     @Override

chrome/browser/password_check/android/javatests/src/org/chromium/chrome/browser/password_check/PasswordCheckViewTest.java

@@ -738,7 +738,7 @@ public class PasswordCheckViewTest {
     }
 
     private MVCListAdapter.ListItem buildCredentialItem(CompromisedCredential credential) {
-        return new MVCListAdapter.ListItem(credential.hasScript()
+        return new MVCListAdapter.ListItem(credential.hasAutoChangeButton()
                         ? PasswordCheckProperties.ItemType.COMPROMISED_CREDENTIAL_WITH_SCRIPT
                         : PasswordCheckProperties.ItemType.COMPROMISED_CREDENTIAL,
                 new PropertyModel

chrome/browser/password_check/android/password_check_bridge.cc

@@ -90,7 +90,7 @@ void PasswordCheckBridge::GetCompromisedCredentials(
          password_manager::InsecureCredentialTypeFlags::kCredentialLeaked),
         (credential.insecure_type ==
          password_manager::InsecureCredentialTypeFlags::kCredentialPhished),
-        credential.has_script);
+        credential.has_auto_change_button);
   }
 }
 

chrome/browser/password_check/android/password_check_manager.cc

@@ -224,7 +224,7 @@ CompromisedCredentialForUI PasswordCheckManager::MakeUICredential(
       credential.signon_realm);
 
   ui_credential.display_username = GetDisplayUsername(credential.username);
-  ui_credential.has_script =
+  ui_credential.has_auto_change_button =
       !credential.username.empty() && ShouldOfferAutomaticPasswordChange() &&
       password_script_fetcher_->IsScriptAvailable(
           url::Origin::Create(credential.url.GetOrigin()));

chrome/browser/password_check/android/password_check_manager.h

@@ -51,7 +51,7 @@ class PasswordCheckManager
     base::string16 display_origin;
     std::string package_name;
     std::string change_password_url;
-    bool has_script = false;
+    bool has_auto_change_button = false;
   };
 
   // `observer` must outlive `this`.

chrome/browser/password_check/android/password_check_manager_unittest.cc

@@ -188,7 +188,7 @@ auto ExpectCompromisedCredentialForUI(
     const base::Optional<std::string>& package_name,
     const base::Optional<std::string>& change_password_url,
     InsecureCredentialTypeFlags insecure_type,
-    bool has_script) {
+    bool has_auto_change_button) {
   auto package_name_field_matcher =
       package_name.has_value()
           ? Field(&CompromisedCredentialForUI::package_name,
@@ -204,7 +204,8 @@ auto ExpectCompromisedCredentialForUI(
       Field(&CompromisedCredentialForUI::display_origin, display_origin),
       package_name_field_matcher, change_password_url_field_matcher,
       Field(&CompromisedCredentialForUI::insecure_type, insecure_type),
-      Field(&CompromisedCredentialForUI::has_script, has_script));
+      Field(&CompromisedCredentialForUI::has_auto_change_button,
+            has_auto_change_button));
 }
 
 }  // namespace
@@ -343,7 +344,7 @@ TEST_F(PasswordCheckManagerTest, CorrectlyCreatesUIStructForSiteCredential) {
           base::ASCIIToUTF16(kUsername1), base::ASCIIToUTF16("example.com"),
           base::nullopt, "https://example.com/",
           InsecureCredentialTypeFlags::kCredentialLeaked,
-          /*has_script=*/false)));
+          /*has_auto_change_button=*/false)));
 }
 
 TEST_F(PasswordCheckManagerTest, CorrectlyCreatesUIStructForAppCredentials) {
@@ -367,12 +368,12 @@ TEST_F(PasswordCheckManagerTest, CorrectlyCreatesUIStructForAppCredentials) {
               base::ASCIIToUTF16(kUsername1),
               base::ASCIIToUTF16("App (com.example.app)"), "com.example.app",
               base::nullopt, InsecureCredentialTypeFlags::kCredentialLeaked,
-              /*has_script=*/false),
+              /*has_auto_change_button=*/false),
           ExpectCompromisedCredentialForUI(
               base::ASCIIToUTF16(kUsername2), base::ASCIIToUTF16("Example App"),
               "com.example.app", base::nullopt,
               InsecureCredentialTypeFlags::kCredentialLeaked,
-              /*has_script=*/false)));
+              /*has_auto_change_button=*/false)));
 }
 
 TEST_F(PasswordCheckManagerTest, SetsTimestampOnSuccessfulCheck) {
@@ -422,7 +423,7 @@ TEST_F(PasswordCheckManagerTest,
           base::ASCIIToUTF16(kUsername1), base::ASCIIToUTF16("example.com"),
           base::nullopt, "https://example.com/",
           InsecureCredentialTypeFlags::kCredentialLeaked,
-          /*has_script=*/false)));
+          /*has_auto_change_button=*/false)));
 }
 
 TEST_F(PasswordCheckManagerTest,
@@ -449,7 +450,7 @@ TEST_F(PasswordCheckManagerTest,
           base::ASCIIToUTF16(kUsername1), base::ASCIIToUTF16("example.com"),
           base::nullopt, "https://example.com/",
           InsecureCredentialTypeFlags::kCredentialLeaked,
-          /*has_script=*/true)));
+          /*has_auto_change_button=*/true)));
 }
 
 TEST_F(PasswordCheckManagerTest,
@@ -476,7 +477,7 @@ TEST_F(PasswordCheckManagerTest,
           base::ASCIIToUTF16("No username"), base::ASCIIToUTF16("example.com"),
           base::nullopt, "https://example.com/",
           InsecureCredentialTypeFlags::kCredentialLeaked,
-          /*has_script=*/false)));
+          /*has_auto_change_button=*/false)));
 }
 
 TEST_F(PasswordCheckManagerTest, UpdatesProgressCorrectly) {