The password leak check now links to the local Chrome settings page.

TBR=holte@chromium.org

Bug: 1049200
Change-Id: I096daf099c8bf97f0699aacb4ca3cd0a58d012d8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2090430
Commit-Queue: Vasilii Sukhanov <vasilii@chromium.org>
Reviewed-by: Jan Wilken Dörrie <jdoerrie@chromium.org>
Cr-Commit-Position: refs/heads/master@{#748174}

chrome/browser/ui/chrome_pages.cc

@@ -449,6 +449,11 @@ void ShowPasswordManager(Browser* browser) {
   ShowSettingsSubPage(browser, kPasswordManagerSubPage);
 }
 
+void ShowPasswordCheck(Browser* browser) {
+  base::RecordAction(UserMetricsAction("Options_ShowPasswordCheck"));
+  ShowSettingsSubPage(browser, kPasswordCheckSubPage);
+}
+
 void ShowImportDialog(Browser* browser) {
   base::RecordAction(UserMetricsAction("Import_ShowDlg"));
   ShowSettingsSubPage(browser, kImportDataSubPage);

chrome/browser/ui/chrome_pages.h

@@ -125,6 +125,7 @@ void ShowSettingsSubPageInTabbedBrowser(Browser* browser,
                                         const std::string& sub_page);
 void ShowClearBrowsingDataDialog(Browser* browser);
 void ShowPasswordManager(Browser* browser);
+void ShowPasswordCheck(Browser* browser);
 void ShowImportDialog(Browser* browser);
 void ShowAboutChrome(Browser* browser);
 void ShowSearchEngineSettings(Browser* browser);

chrome/browser/ui/passwords/manage_passwords_ui_controller.cc

@@ -42,6 +42,7 @@
 #include "components/password_manager/core/browser/password_ui_utils.h"
 #include "components/password_manager/core/browser/statistics_table.h"
 #include "components/password_manager/core/common/credential_manager_types.h"
+#include "components/password_manager/core/common/password_manager_features.h"
 #include "components/signin/public/identity_manager/identity_manager.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/web_contents.h"
@@ -493,8 +494,14 @@ void ManagePasswordsUIController::NavigateToPasswordManagerAccountDashboard(
 }
 
 void ManagePasswordsUIController::NavigateToPasswordCheckup() {
-  NavigateToPasswordCheckupPage(
-      Profile::FromBrowserContext(web_contents()->GetBrowserContext()));
+  if (base::FeatureList::IsEnabled(
+          password_manager::features::kPasswordCheck)) {
+    chrome::ShowPasswordCheck(
+        chrome::FindBrowserWithWebContents(web_contents()));
+  } else {
+    NavigateToPasswordCheckupPage(
+        Profile::FromBrowserContext(web_contents()->GetBrowserContext()));
+  }
 }
 
 void ManagePasswordsUIController::EnableSync(const AccountInfo& account,

chrome/common/webui_url_constants.cc

@@ -374,6 +374,7 @@ const char kHandlerSettingsSubPage[] = "handlers";
 const char kImportDataSubPage[] = "importData";
 const char kLanguageOptionsSubPage[] = "languages";
 const char kOnStartupSubPage[] = "onStartup";
+const char kPasswordCheckSubPage[] = "passwords/check";
 const char kPasswordManagerSubPage[] = "passwords";
 const char kPaymentsSubPage[] = "payments";
 const char kPrintingSettingsSubPage[] = "printing";

chrome/common/webui_url_constants.h

@@ -330,6 +330,7 @@ extern const char kImportDataSubPage[];
 extern const char kLanguageOptionsSubPage[];
 extern const char kManageProfileSubPage[];
 extern const char kOnStartupSubPage[];
+extern const char kPasswordCheckSubPage[];
 extern const char kPasswordManagerSubPage[];
 extern const char kPaymentsSubPage[];
 extern const char kPeopleSubPage[];

components/password_manager/core/browser/leak_detection_dialog_utils.cc

@@ -100,6 +100,10 @@ base::string16 GetLeakDetectionTooltip() {
 }
 
 bool ShouldCheckPasswords(CredentialLeakType leak_type) {
+  if (base::FeatureList::IsEnabled(
+          password_manager::features::kPasswordCheck)) {
+    return password_manager::IsPasswordUsedOnOtherSites(leak_type);
+  }
   return password_manager::IsPasswordUsedOnOtherSites(leak_type) &&
          password_manager::IsSyncingPasswordsNormally(leak_type);
 }

components/password_manager/core/browser/leak_detection_dialog_utils_unittest.cc

@@ -3,7 +3,10 @@
 // found in the LICENSE file.
 
 #include "components/password_manager/core/browser/leak_detection_dialog_utils.h"
+
 #include "base/strings/utf_string_conversions.h"
+#include "base/test/scoped_feature_list.h"
+#include "components/password_manager/core/common/password_manager_features.h"
 #include "components/strings/grit/components_strings.h"
 #include "components/url_formatter/elide_url.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -52,6 +55,17 @@ const struct {
      IDS_LEAK_CHECK_CREDENTIALS, IDS_CLOSE,
      IDS_CREDENTIAL_LEAK_CHECK_PASSWORDS_MESSAGE,
      IDS_CREDENTIAL_LEAK_TITLE_CHECK, true, true}};
+
+struct BulkCheckParams {
+  // Specifies the test case.
+  CredentialLeakType leak_type;
+  bool should_check_passwords;
+} kBulkCheckTestCases[] = {
+    {CreateLeakType(IsSaved(false), IsReused(false), IsSyncing(false)), false},
+    {CreateLeakType(IsSaved(true), IsReused(false), IsSyncing(false)), false},
+    {CreateLeakType(IsSaved(false), IsReused(true), IsSyncing(false)), true},
+    {CreateLeakType(IsSaved(true), IsReused(true), IsSyncing(false)), true},
+    {CreateLeakType(IsSaved(true), IsReused(true), IsSyncing(true)), true}};
 }  // namespace
 
 TEST(CredentialLeakDialogUtilsTest, GetAcceptButtonLabel) {
@@ -144,4 +158,44 @@ TEST(CredentialLeakDialogUtilsTest, ShouldShowCancelButton) {
   }
 }
 
+class BulkCheckCredentialLeakDialogUtilsTest
+    : public testing::TestWithParam<BulkCheckParams> {
+ public:
+  BulkCheckCredentialLeakDialogUtilsTest() {
+    feature_list_.InitAndEnableFeature(features::kPasswordCheck);
+  }
+
+ private:
+  base::test::ScopedFeatureList feature_list_;
+};
+
+TEST_P(BulkCheckCredentialLeakDialogUtilsTest, ShouldCheckPasswords) {
+  SCOPED_TRACE(testing::Message() << GetParam().leak_type);
+  EXPECT_EQ(GetParam().should_check_passwords,
+            ShouldCheckPasswords(GetParam().leak_type));
+}
+
+TEST_P(BulkCheckCredentialLeakDialogUtilsTest, Buttons) {
+  SCOPED_TRACE(testing::Message() << GetParam().leak_type);
+  EXPECT_EQ(GetParam().should_check_passwords,
+            ShouldShowCancelButton(GetParam().leak_type));
+  EXPECT_EQ(l10n_util::GetStringUTF16(GetParam().should_check_passwords
+                                          ? IDS_LEAK_CHECK_CREDENTIALS
+                                          : IDS_OK),
+            GetAcceptButtonLabel(GetParam().leak_type));
+  EXPECT_EQ(l10n_util::GetStringUTF16(IDS_CLOSE), GetCancelButtonLabel());
+}
+
+TEST_P(BulkCheckCredentialLeakDialogUtilsTest, Title) {
+  SCOPED_TRACE(testing::Message() << GetParam().leak_type);
+  EXPECT_EQ(l10n_util::GetStringUTF16(GetParam().should_check_passwords
+                                          ? IDS_CREDENTIAL_LEAK_TITLE_CHECK
+                                          : IDS_CREDENTIAL_LEAK_TITLE_CHANGE),
+            GetTitle(GetParam().leak_type));
+}
+
+INSTANTIATE_TEST_SUITE_P(InstantiationName,
+                         BulkCheckCredentialLeakDialogUtilsTest,
+                         testing::ValuesIn(kBulkCheckTestCases));
+
 }  // namespace password_manager

tools/metrics/actions/actions.xml

@@ -16827,14 +16827,16 @@ should be able to be added at any place in this file.
   <description>Settings: Keyboard settings</description>
 </action>
 
-<action name="Options_ShowPasswordManager">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
-  <description>Please enter the description of this user action.</description>
+<action name="Options_ShowPasswordCheck">
+  <owner>jdoerrie@chromium.org</owner>
+  <owner>vasilii@chromium.org</owner>
+  <description>Settings: passwords check</description>
 </action>
 
-<action name="Options_ShowPasswordsExceptions">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
-  <description>Please enter the description of this user action.</description>
+<action name="Options_ShowPasswordManager">
+  <owner>jdoerrie@chromium.org</owner>
+  <owner>vasilii@chromium.org</owner>
+  <description>Settings: saved passwords</description>
 </action>
 
 <action name="Options_ShowPowerSettings">