Revert "Remove change_password_handler code."

This reverts commit 9b161472.

Reason for revert:

Findit (https://goo.gl/kROfz5) identified CL at revision 704421 as the
culprit for failures in the build cycles as shown on:
https://analysis.chromium.org/waterfall/culprit?key=ag9zfmZpbmRpdC1mb3ItbWVyRAsSDVdmU3VzcGVjdGVkQ0wiMWNocm9taXVtLzliMTYxNDcyODQ4ZGE1YmE1ZDI0MGExZDE1YWIyYmUwNjFlNGQ3NDcM

Sample Failed Build: https://ci.chromium.org/buildbot/chromium/win32-archive-rel/5897

Sample Failed Step: compile

Original change's description:
> Remove change_password_handler code.
> 
> The change password card in the settings is not triggered
> from password protection so it should be removed completely.
> This is part 2 of the removal of the change password handler.
> First part was crrev.com/c/1834950.
> 
> Bug: 991764
> Change-Id: I2d877366f67bb7e30763b232211df62458554084
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1834906
> Commit-Queue: Bettina Dea <bdea@chromium.org>
> Reviewed-by: Tommy Li <tommycli@chromium.org>
> Reviewed-by: Varun Khaneja <vakh@chromium.org>
> Reviewed-by: Nathan Parker <nparker@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#704421}


Change-Id: I43b87004899419781cb8021b7f2946158c679411
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 991764
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1851233
Cr-Commit-Position: refs/heads/master@{#704423}

chrome/browser/resources/settings/BUILD.gn

@@ -68,6 +68,7 @@ group("closure_compile") {
     "appearance_page:closure_compile",
     "autofill_page:closure_compile",
     "basic_page:closure_compile",
+    "change_password_page:closure_compile",
     "clear_browsing_data_dialog:closure_compile",
     "controls:closure_compile",
     "downloads_page:closure_compile",

chrome/browser/resources/settings/basic_page/BUILD.gn

@@ -16,6 +16,7 @@ js_library("basic_page") {
     "..:route",
     "..:search_settings",
     "../android_apps_page:android_apps_browser_proxy",
+    "../change_password_page:change_password_browser_proxy",
     "../chrome_cleanup_page:chrome_cleanup_proxy",
     "../prefs:prefs_behavior",
     "../settings_page:main_page_behavior",

chrome/browser/resources/settings/basic_page/basic_page.js

@@ -56,6 +56,11 @@ Polymer({
     /** @type {!AndroidAppsInfo|undefined} */
     androidAppsInfo: Object,
 
+    showChangePassword: {
+      type: Boolean,
+      value: false,
+    },
+
     /**
      * Dictionary defining page visibility.
      * @type {!PageVisibility}
@@ -144,6 +149,10 @@ Polymer({
     this.allowCrostini_ = loadTimeData.valueExists('allowCrostini') &&
         loadTimeData.getBoolean('allowCrostini');
 
+    this.addWebUIListener('change-password-visibility', visibility => {
+      this.showChangePassword = visibility;
+    });
+
     if (settings.AndroidAppsBrowserProxyImpl) {
       this.addWebUIListener(
           'android-apps-info-update', this.androidAppsInfoUpdate_.bind(this));

chrome/browser/resources/settings/change_password_page/BUILD.gn

+# Copyright 2018 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//third_party/closure_compiler/compile_js.gni")
+
+js_type_check("closure_compile") {
+  deps = [
+    ":change_password_browser_proxy",
+    ":change_password_page",
+  ]
+}
+
+js_library("change_password_browser_proxy") {
+  deps = [
+    "//ui/webui/resources/js:assert",
+    "//ui/webui/resources/js:cr",
+  ]
+}
+
+js_library("change_password_page") {
+  deps = [
+    ":change_password_browser_proxy",
+    "//ui/webui/resources/js:cr",
+    "//ui/webui/resources/js:load_time_data",
+    "//ui/webui/resources/js:util",
+    "//ui/webui/resources/js:web_ui_listener_behavior",
+  ]
+  externs_list = [ "$externs_path/settings_private.js" ]
+}

chrome/browser/resources/settings/change_password_page/change_password_browser_proxy.html

+<link rel="import" href="chrome://resources/html/assert.html">
+<link rel="import" href="chrome://resources/html/cr.html">
+<script src="change_password_browser_proxy.js"></script>

chrome/browser/resources/settings/change_password_page/change_password_browser_proxy.js

+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+cr.define('settings', function() {
+  /** @interface */
+  class ChangePasswordBrowserProxy {
+    /** Initialize the change password handler.*/
+    initializeChangePasswordHandler() {}
+
+    /**
+     * Initiate the change password process. e.g., for Gmail users, it
+     * navigates to accounts.google.com; for GSuite users, it navigates to the
+     * corresponding change password URLs.
+     */
+    changePassword() {}
+  }
+
+  /**
+   * @implements {settings.ChangePasswordBrowserProxy}
+   */
+  class ChangePasswordBrowserProxyImpl {
+    /** @override */
+    initializeChangePasswordHandler() {
+      chrome.send('initializeChangePasswordHandler');
+    }
+
+    /** @override */
+    changePassword() {
+      chrome.send('changePassword');
+    }
+  }
+
+  cr.addSingletonGetter(ChangePasswordBrowserProxyImpl);
+
+  return {
+    ChangePasswordBrowserProxy: ChangePasswordBrowserProxy,
+    ChangePasswordBrowserProxyImpl: ChangePasswordBrowserProxyImpl,
+  };
+});

chrome/browser/resources/settings/change_password_page/change_password_page.html

+<link rel="import" href="chrome://resources/html/polymer.html">
+
+<link rel="import" href="../settings_shared_css.html">
+<link rel="import" href="change_password_browser_proxy.html">
+<link rel="import" href="chrome://resources/cr_elements/cr_button/cr_button.html">
+<link rel="import" href="chrome://resources/cr_elements/icons.html">
+<link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
+
+<dom-module id="settings-change-password-page">
+  <template>
+    <style include="settings-shared">
+      .icon-container {
+        padding-inline-end: var(--cr-section-padding);
+      }
+
+      .change-password-icon {
+        vertical-align: top;
+      }
+
+      iron-icon[icon='cr:warning'] {
+         --iron-icon-fill-color: var(--settings-error-color);
+      }
+
+      .top-aligned-settings-box {
+        align-items: start;
+        min-height: 0;
+        padding: var(--cr-section-vertical-padding) var(--cr-section-padding);
+      }
+    </style>
+    <div class="settings-box first top-aligned-settings-box">
+        <div class="icon-container">
+          <iron-icon icon="cr:security"
+            class="change-password-icon"></iron-icon>
+        </div>
+      <div class="start">
+        <div>$i18n{changePasswordPageTitle}</div>
+        <div class="secondary">
+           $i18n{changePasswordPageDetails}
+        </div>
+      </div>
+      <div class="separator"></div>
+      <cr-button class="action-button" id="changePassword"
+          on-click="changePassword_">
+        $i18n{changePasswordPageButton}
+      </cr-button>
+    </div>
+  </template>
+  <script src="change_password_page.js"></script>
+</dom-module>

chrome/browser/resources/settings/change_password_page/change_password_page.js

+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+/**
+ * @fileoverview
+ * 'change-password-page' is the settings page containing change password
+ * settings.
+ */
+Polymer({
+  is: 'settings-change-password-page',
+
+  /** @private */
+  changePassword_: function() {
+    settings.ChangePasswordBrowserProxyImpl.getInstance().changePassword();
+  },
+});

chrome/browser/resources/settings/os_settings_resources.grd

@@ -374,6 +374,20 @@
       <structure name="IDR_OS_SETTINGS_GLOBAL_SCROLL_TARGET_BEHAVIOR_JS"
                  file="global_scroll_target_behavior.js"
                  type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_CHANGE_PASSWORD_BROWSER_PROXY_HTML"
+                 file="change_password_page/change_password_browser_proxy.html"
+                 type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_CHANGE_PASSWORD_BROWSER_PROXY_JS"
+                 file="change_password_page/change_password_browser_proxy.js"
+                 type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_CHANGE_PASSWORD_PAGE_HTML"
+                 file="change_password_page/change_password_page.html"
+                 type="chrome_html"
+                 preprocess="true" />
+      <structure name="IDR_OS_SETTINGS_CHANGE_PASSWORD_PAGE_JS"
+                 file="change_password_page/change_password_page.js"
+                 type="chrome_html"
+                 preprocess="true" />
       <structure name="IDR_OS_SETTINGS_CLEAR_BROWSING_DATA_BROWSER_PROXY_HTML"
                  file="clear_browsing_data_dialog/clear_browsing_data_browser_proxy.html"
                  type="chrome_html" />

chrome/browser/resources/settings/settings_resources.grd

@@ -319,6 +319,20 @@
       <structure name="IDR_SETTINGS_GLOBAL_SCROLL_TARGET_BEHAVIOR_JS"
                  file="global_scroll_target_behavior.js"
                  type="chrome_html" />
+      <structure name="IDR_SETTINGS_CHANGE_PASSWORD_BROWSER_PROXY_HTML"
+                 file="change_password_page/change_password_browser_proxy.html"
+                 type="chrome_html" />
+      <structure name="IDR_SETTINGS_CHANGE_PASSWORD_BROWSER_PROXY_JS"
+                 file="change_password_page/change_password_browser_proxy.js"
+                 type="chrome_html" />
+      <structure name="IDR_SETTINGS_CHANGE_PASSWORD_PAGE_HTML"
+                 file="change_password_page/change_password_page.html"
+                 type="chrome_html"
+                 preprocess="true" />
+      <structure name="IDR_SETTINGS_CHANGE_PASSWORD_PAGE_JS"
+                 file="change_password_page/change_password_page.js"
+                 type="chrome_html"
+                 preprocess="true" />
       <if expr="is_win">
         <structure name="IDR_SETTINGS_CHROME_CLEANUP_PROXY_HTML"
                    file="chrome_cleanup_page/chrome_cleanup_proxy.html"

chrome/browser/safe_browsing/chrome_password_protection_service.cc

@@ -309,6 +309,19 @@ ChromePasswordProtectionService::GetPasswordProtectionService(
 }
 
 #if defined(SYNC_PASSWORD_REUSE_WARNING_ENABLED)
+// static
+bool ChromePasswordProtectionService::ShouldShowChangePasswordSettingUI(
+    Profile* profile) {
+  ChromePasswordProtectionService* service =
+      ChromePasswordProtectionService::GetPasswordProtectionService(profile);
+  if (!service)
+    return false;
+  auto* unhandled_sync_password_reuses = profile->GetPrefs()->GetDictionary(
+      prefs::kSafeBrowsingUnhandledGaiaPasswordReuses);
+  return unhandled_sync_password_reuses &&
+         !unhandled_sync_password_reuses->empty();
+}
+
 // static
 bool ChromePasswordProtectionService::ShouldShowPasswordReusePageInfoBubble(
     content::WebContents* web_contents,

chrome/browser/safe_browsing/chrome_password_protection_service.h

@@ -102,6 +102,8 @@ class ChromePasswordProtectionService : public PasswordProtectionService {
       Profile* profile);
 
 #if defined(SYNC_PASSWORD_REUSE_WARNING_ENABLED)
+  static bool ShouldShowChangePasswordSettingUI(Profile* profile);
+
   // Called by SecurityStateTabHelper to determine if page info bubble should
   // show password reuse warning.
   static bool ShouldShowPasswordReusePageInfoBubble(

chrome/browser/ui/BUILD.gn

@@ -1277,6 +1277,8 @@ jumbo_split_static_library("ui") {
       "webui/settings/appearance_handler.h",
       "webui/settings/browser_lifetime_handler.cc",
       "webui/settings/browser_lifetime_handler.h",
+      "webui/settings/change_password_handler.cc",
+      "webui/settings/change_password_handler.h",
       "webui/settings/custom_home_pages_table_model.cc",
       "webui/settings/custom_home_pages_table_model.h",
       "webui/settings/downloads_handler.cc",

chrome/browser/ui/webui/settings/change_password_handler.cc

+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/ui/webui/settings/change_password_handler.h"
+
+#include "base/bind.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/safe_browsing/chrome_password_protection_service.h"
+#include "components/prefs/pref_service.h"
+#include "components/safe_browsing/password_protection/metrics_util.h"
+#include "components/safe_browsing/proto/csd.pb.h"
+#include "content/public/browser/web_contents.h"
+#include "content/public/browser/web_ui.h"
+
+namespace settings {
+
+using password_manager::metrics_util::PasswordType;
+using safe_browsing::ChromePasswordProtectionService;
+using safe_browsing::LoginReputationClientResponse;
+using safe_browsing::RequestOutcome;
+
+ChangePasswordHandler::ChangePasswordHandler(
+    Profile* profile,
+    safe_browsing::ChromePasswordProtectionService* service)
+    : profile_(profile), service_(service) {
+  DCHECK(service_);
+}
+
+ChangePasswordHandler::~ChangePasswordHandler() {}
+
+void ChangePasswordHandler::RegisterMessages() {
+  web_ui()->RegisterMessageCallback(
+      "initializeChangePasswordHandler",
+      base::BindRepeating(&ChangePasswordHandler::HandleInitialize,
+                          base::Unretained(this)));
+  web_ui()->RegisterMessageCallback(
+      "changePassword",
+      base::BindRepeating(&ChangePasswordHandler::HandleChangePassword,
+                          base::Unretained(this)));
+}
+
+void ChangePasswordHandler::OnJavascriptAllowed() {
+  pref_registrar_.Init(profile_->GetPrefs());
+  pref_registrar_.Add(
+      prefs::kSafeBrowsingUnhandledGaiaPasswordReuses,
+      base::Bind(&ChangePasswordHandler::UpdateChangePasswordCardVisibility,
+                 base::Unretained(this)));
+}
+
+void ChangePasswordHandler::OnJavascriptDisallowed() {
+  pref_registrar_.RemoveAll();
+}
+
+void ChangePasswordHandler::HandleInitialize(const base::ListValue* args) {
+    AllowJavascript();
+    UpdateChangePasswordCardVisibility();
+}
+
+void ChangePasswordHandler::HandleChangePassword(const base::ListValue* args) {
+  service_->OnUserAction(
+      web_ui()->GetWebContents(),
+      service_->reused_password_account_type_for_last_shown_warning(),
+      RequestOutcome::UNKNOWN,
+      LoginReputationClientResponse::VERDICT_TYPE_UNSPECIFIED, "unused_token",
+      safe_browsing::WarningUIType::CHROME_SETTINGS,
+      safe_browsing::WarningAction::CHANGE_PASSWORD);
+}
+
+void ChangePasswordHandler::UpdateChangePasswordCardVisibility() {
+  FireWebUIListener(
+      "change-password-visibility",
+      base::Value(
+          service_->IsWarningEnabled(
+              service_
+                  ->reused_password_account_type_for_last_shown_warning()) &&
+          safe_browsing::ChromePasswordProtectionService::
+              ShouldShowChangePasswordSettingUI(profile_)));
+}
+
+}  // namespace settings

chrome/browser/ui/webui/settings/change_password_handler.h

+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CHROME_BROWSER_UI_WEBUI_SETTINGS_CHANGE_PASSWORD_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_SETTINGS_CHANGE_PASSWORD_HANDLER_H_
+
+#include "base/macros.h"
+#include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h"
+#include "components/prefs/pref_change_registrar.h"
+
+class Profile;
+
+namespace safe_browsing {
+class ChromePasswordProtectionService;
+}
+
+namespace settings {
+
+// Chrome "Change Password" settings page UI handler.
+class ChangePasswordHandler : public SettingsPageUIHandler {
+ public:
+  explicit ChangePasswordHandler(
+      Profile* profile,
+      safe_browsing::ChromePasswordProtectionService* service);
+  ~ChangePasswordHandler() override;
+
+  // settings::SettingsPageUIHandler:
+  void RegisterMessages() override;
+  void OnJavascriptAllowed() override;
+  void OnJavascriptDisallowed() override;
+
+ private:
+  void HandleInitialize(const base::ListValue* args);
+
+  void HandleChangePassword(const base::ListValue* args);
+
+  void UpdateChangePasswordCardVisibility();
+
+  Profile* profile_;
+
+  PrefChangeRegistrar pref_registrar_;
+
+  safe_browsing::ChromePasswordProtectionService* service_;
+
+  DISALLOW_COPY_AND_ASSIGN(ChangePasswordHandler);
+};
+
+}  // namespace settings
+
+#endif  // CHROME_BROWSER_UI_WEBUI_SETTINGS_CHANGE_PASSWORD_HANDLER_H_

chrome/test/data/webui/settings/change_password_page_test.js

+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+/** @implements {settings.ChangePasswordBrowserProxy} */
+class TestChangePasswordBrowserProxy extends TestBrowserProxy {
+  constructor() {
+    super([
+      'changePassword',
+    ]);
+  }
+
+  /** @override */
+  changePassword() {
+    this.methodCalled('changePassword');
+  }
+}
+
+suite('ChangePasswordHandler', function() {
+  let changePasswordPage = null;
+
+  /** @type {?TestChangePasswordBrowserProxy} */
+  let browserProxy = null;
+
+  setup(function() {
+    browserProxy = new TestChangePasswordBrowserProxy();
+    settings.ChangePasswordBrowserProxyImpl.instance_ = browserProxy;
+
+    PolymerTest.clearBody();
+
+    changePasswordPage =
+        document.createElement('settings-change-password-page');
+    document.body.appendChild(changePasswordPage);
+  });
+
+  teardown(function() {
+    changePasswordPage.remove();
+  });
+
+  test('changePasswordButtonPressed', function() {
+    let actionButton = changePasswordPage.$$('#changePassword');
+    assertTrue(!!actionButton);
+    actionButton.click();
+    return browserProxy.whenCalled('changePassword');
+  });
+});

chrome/test/data/webui/settings/cr_settings_browsertest.js

@@ -2407,6 +2407,30 @@ TEST_F('CrSettingsExtensionControlledIndicatorTest', 'All', function() {
   mocha.run();
 });
 
+/**
+ * @constructor
+ * @extends {CrSettingsBrowserTest}
+ */
+function CrSettingsChangePasswordPageTest() {}
+
+CrSettingsChangePasswordPageTest.prototype = {
+  __proto__: CrSettingsBrowserTest.prototype,
+
+  /** @override */
+  browsePreload:
+      'chrome://settings/change_password_page/change_password_page.html',
+
+  /** @override */
+  extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
+    '../test_browser_proxy.js',
+    'change_password_page_test.js',
+  ]),
+};
+
+TEST_F('CrSettingsChangePasswordPageTest', 'All', function() {
+  mocha.run();
+});
+
 /**
  * @constructor
  * @extends {CrSettingsBrowserTest}

chrome/test/data/webui/settings/settings_main_test.js

@@ -349,6 +349,25 @@ cr.define('settings_main_page', function() {
       return assertPageVisibility('block', 'block');
     });
 
+    test('verify showChangePassword value', function() {
+      settings.navigateTo(settings.routes.BASIC);
+      Polymer.dom.flush();
+      const basicPage = settingsMain.$$('settings-basic-page');
+      assertTrue(!!basicPage);
+      assertFalse(basicPage.showChangePassword);
+      assertFalse(!!basicPage.$$('settings-change-password-page'));
+
+      cr.webUIListenerCallback('change-password-visibility', true);
+      Polymer.dom.flush();
+      assertTrue(basicPage.showChangePassword);
+      assertTrue(!!basicPage.$$('settings-change-password-page'));
+
+      cr.webUIListenerCallback('change-password-visibility', false);
+      Polymer.dom.flush();
+      assertFalse(basicPage.showChangePassword);
+      assertFalse(!!basicPage.$$('settings-change-password-page'));
+    });
+
     test('updates the title based on current route', function() {
       settings.navigateTo(settings.routes.BASIC);
       assertEquals(document.title, loadTimeData.getString('settings'));