Update PhishGuard password reuse dialog

Chromium screenshot: https://drive.google.com/file/d/1uNLiVaDEFTHzU5_NFkzzVffwyr-x2FCq/view?usp=sharing

Bug: 931812
Change-Id: Ie5b821530bd15efeb7e9b30389fec8e74fdbfc0a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1530115Reviewed-by: Varun Khaneja <vakh@chromium.org>
Reviewed-by: Emily Stark <estark@chromium.org>
Commit-Queue: Livvie Lin <livvielin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#644461}

chrome/browser/safe_browsing/chrome_password_protection_service.cc

@@ -1219,7 +1219,10 @@ base::string16 ChromePasswordProtectionService::GetWarningDetailText(
 
   if (GetSyncAccountType() !=
       safe_browsing::LoginReputationClientRequest::PasswordReuseEvent::GSUITE) {
-    return l10n_util::GetStringUTF16(IDS_PAGE_INFO_CHANGE_PASSWORD_DETAILS);
+    return l10n_util::GetStringUTF16(
+        GetSyncAccountType() == PasswordReuseEvent::NOT_SIGNED_IN
+            ? IDS_PAGE_INFO_CHANGE_PASSWORD_DETAILS_SIGNED_IN_NON_SYNC
+            : IDS_PAGE_INFO_CHANGE_PASSWORD_DETAILS_SYNC);
   }
 
   std::string org_name = GetOrganizationName(password_type);

chrome/browser/safe_browsing/chrome_password_protection_service_unittest.cc

@@ -1054,16 +1054,16 @@ TEST_F(ChromePasswordProtectionServiceTest,
 
 TEST_F(ChromePasswordProtectionServiceTest,
        VerifyGetWarningDetailTextEnterprise) {
-  base::string16 default_warning_text =
-      l10n_util::GetStringUTF16(IDS_PAGE_INFO_CHANGE_PASSWORD_DETAILS);
+  base::string16 warning_text_non_sync = l10n_util::GetStringUTF16(
+      IDS_PAGE_INFO_CHANGE_PASSWORD_DETAILS_SIGNED_IN_NON_SYNC);
   base::string16 generic_enterprise_warning_text = l10n_util::GetStringUTF16(
       IDS_PAGE_INFO_CHANGE_PASSWORD_DETAILS_ENTERPRISE);
   base::string16 warning_text_with_org_name = l10n_util::GetStringFUTF16(
       IDS_PAGE_INFO_CHANGE_PASSWORD_DETAILS_ENTERPRISE_WITH_ORG_NAME,
       base::UTF8ToUTF16("example.com"));
 
-  EXPECT_EQ(default_warning_text, service_->GetWarningDetailText(
-                                      PasswordReuseEvent::SIGN_IN_PASSWORD));
+  EXPECT_EQ(warning_text_non_sync, service_->GetWarningDetailText(
+                                       PasswordReuseEvent::SIGN_IN_PASSWORD));
   EXPECT_EQ(
       generic_enterprise_warning_text,
       service_->GetWarningDetailText(PasswordReuseEvent::ENTERPRISE_PASSWORD));
@@ -1081,13 +1081,15 @@ TEST_F(ChromePasswordProtectionServiceTest,
 }
 
 TEST_F(ChromePasswordProtectionServiceTest, VerifyGetWarningDetailTextGmail) {
-  base::string16 default_warning_text =
-      l10n_util::GetStringUTF16(IDS_PAGE_INFO_CHANGE_PASSWORD_DETAILS);
+  base::string16 warning_text_non_sync = l10n_util::GetStringUTF16(
+      IDS_PAGE_INFO_CHANGE_PASSWORD_DETAILS_SIGNED_IN_NON_SYNC);
+  base::string16 warning_text_sync =
+      l10n_util::GetStringUTF16(IDS_PAGE_INFO_CHANGE_PASSWORD_DETAILS_SYNC);
   base::string16 generic_enterprise_warning_text = l10n_util::GetStringUTF16(
       IDS_PAGE_INFO_CHANGE_PASSWORD_DETAILS_ENTERPRISE);
 
-  EXPECT_EQ(default_warning_text, service_->GetWarningDetailText(
-                                      PasswordReuseEvent::SIGN_IN_PASSWORD));
+  EXPECT_EQ(warning_text_non_sync, service_->GetWarningDetailText(
+                                       PasswordReuseEvent::SIGN_IN_PASSWORD));
   EXPECT_EQ(
       generic_enterprise_warning_text,
       service_->GetWarningDetailText(PasswordReuseEvent::ENTERPRISE_PASSWORD));
@@ -1096,8 +1098,8 @@ TEST_F(ChromePasswordProtectionServiceTest, VerifyGetWarningDetailTextGmail) {
   CoreAccountInfo account_info = SetPrimaryAccount(kTestGmail);
   SetUpSyncAccount(kNoHostedDomainFound, account_info);
   EXPECT_EQ(PasswordReuseEvent::GMAIL, service_->GetSyncAccountType());
-  EXPECT_EQ(default_warning_text, service_->GetWarningDetailText(
-                                      PasswordReuseEvent::SIGN_IN_PASSWORD));
+  EXPECT_EQ(warning_text_sync, service_->GetWarningDetailText(
+                                   PasswordReuseEvent::SIGN_IN_PASSWORD));
   EXPECT_EQ(
       generic_enterprise_warning_text,
       service_->GetWarningDetailText(PasswordReuseEvent::ENTERPRISE_PASSWORD));

chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc

@@ -46,7 +46,8 @@ PasswordReuseModalWarningDialog::PasswordReuseModalWarningDialog(
     : content::WebContentsObserver(web_contents),
       done_callback_(std::move(done_callback)),
       service_(service),
-      url_(web_contents->GetLastCommittedURL()) {
+      url_(web_contents->GetLastCommittedURL()),
+      password_type_(password_type) {
   // |service| maybe NULL in tests.
   if (service_)
     service_->AddObserver(this);
@@ -131,7 +132,11 @@ base::string16 PasswordReuseModalWarningDialog::GetDialogButtonLabel(
     ui::DialogButton button) const {
   switch (button) {
     case ui::DIALOG_BUTTON_OK:
-      return l10n_util::GetStringUTF16(IDS_PAGE_INFO_CHANGE_PASSWORD_BUTTON);
+      return l10n_util::GetStringUTF16(
+          password_type_ == safe_browsing::LoginReputationClientRequest::
+                                PasswordReuseEvent::ENTERPRISE_PASSWORD
+              ? IDS_PAGE_INFO_CHANGE_PASSWORD_BUTTON
+              : IDS_PAGE_INFO_PROTECT_ACCOUNT_BUTTON);
     case ui::DIALOG_BUTTON_CANCEL:
       return l10n_util::GetStringUTF16(
           IDS_PAGE_INFO_IGNORE_PASSWORD_WARNING_BUTTON);

chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.h

@@ -55,6 +55,7 @@ class PasswordReuseModalWarningDialog
   OnWarningDone done_callback_;
   ChromePasswordProtectionService* service_;
   const GURL url_;
+  ReusedPasswordType password_type_;
 
   DISALLOW_COPY_AND_ASSIGN(PasswordReuseModalWarningDialog);
 };

components/page_info_strings.grdp

@@ -388,6 +388,12 @@
         <message name="IDS_PAGE_INFO_CHANGE_PASSWORD_DETAILS" desc="A short paragraph explaining to the user that they has reuse their google password on current website.">
           You could lose access to your Google Account. Chrome recommends changing your password now. You'll be asked to sign in.
         </message>
+        <message name="IDS_PAGE_INFO_CHANGE_PASSWORD_DETAILS_SYNC" desc="A short paragraph explaining to a Chrome sync user that they have reused their Google password on the current website.">
+          Chrome can help you protect your Google Account and change your password.
+        </message>
+        <message name="IDS_PAGE_INFO_CHANGE_PASSWORD_DETAILS_SIGNED_IN_NON_SYNC" desc="A short paragraph explaining to a non-sync user that they have reused their Google password on the current website.">
+          Chrome can help you protect your Google Account and change your password. This will notify Google about this site.
+        </message>
         <message name="IDS_PAGE_INFO_CHANGE_PASSWORD_DETAILS_ENTERPRISE" desc="A short paragraph explaining to the user that they have reused their password on the current website.">
           You could lose access to your organization's account or experience identity theft. Chrome recommends changing your password now.
         </message>
@@ -399,6 +405,12 @@
         <message name="IDS_PAGE_INFO_CHANGE_PASSWORD_DETAILS" desc="A short paragraph explaining to the user that they has reuse their google password on current website.">
           You could lose access to your Google Account. Chromium recommends changing your password now. You'll be asked to sign in.
         </message>
+        <message name="IDS_PAGE_INFO_CHANGE_PASSWORD_DETAILS_SYNC" desc="A short paragraph explaining to a Chrome sync user that they have reused their Google password on the current website.">
+          Chromium can help you protect your Google Account and change your password.
+        </message>
+        <message name="IDS_PAGE_INFO_CHANGE_PASSWORD_DETAILS_SIGNED_IN_NON_SYNC" desc="A short paragraph explaining to a non-sync user that they have reused their Google password on the current website.">
+          Chromium can help you protect your Google Account and change your password. This will notify Google about this site.
+        </message>
         <message name="IDS_PAGE_INFO_CHANGE_PASSWORD_DETAILS_ENTERPRISE" desc="A short paragraph explaining to the user that they have reused their password on the current website.">
           You could lose access to your organization's account or experience identity theft. Chromium recommends changing your password now.
         </message>
@@ -411,6 +423,9 @@
         <message name="IDS_PAGE_INFO_CHANGE_PASSWORD_BUTTON" desc="In Title Case: The string used in the page info change password button.">
           Change Password
         </message>
+        <message name="IDS_PAGE_INFO_PROTECT_ACCOUNT_BUTTON" desc="In Title Case: The string used in the page info protect account button.">
+          Protect Account
+        </message>
         <message name="IDS_PAGE_INFO_IGNORE_PASSWORD_WARNING_BUTTON" desc="In Title Case: The string used in the page info ignore password warning button.">
           Ignore
         </message>
@@ -419,6 +434,9 @@
         <message name="IDS_PAGE_INFO_CHANGE_PASSWORD_BUTTON" desc="The string used in the page info change password button.">
           Change password
         </message>
+        <message name="IDS_PAGE_INFO_PROTECT_ACCOUNT_BUTTON" desc="The string used in the page info protect account button.">
+          Protect account
+        </message>
         <message name="IDS_PAGE_INFO_IGNORE_PASSWORD_WARNING_BUTTON" desc="The string used in the page info ignore password warning button.">
           Ignore
         </message>