Settings WebUI: password-export-dialog, fire close when closing dialogs

Bug: 903212
Change-Id: I2963b22bb55a0a3459331303887c6697e973489d
Reviewed-on: https://chromium-review.googlesource.com/c/1334830
Commit-Queue: Esmael El-Moslimany <aee@chromium.org>
Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#607900}

chrome/browser/resources/settings/passwords_and_forms_page/passwords_export_dialog.js

@@ -54,7 +54,9 @@ Polymer({
     showErrorDialog_: Boolean,
   },
 
-  listeners: {'cancel': 'close'},
+  listeners: {
+    'cancel': 'close',
+  },
 
   /**
    * The interface for callbacks to the browser.
@@ -169,6 +171,7 @@ Polymer({
     this.showStartDialog_ = false;
     this.showProgressDialog_ = false;
     this.showErrorDialog_ = false;
+    this.fire('passwords-export-dialog-close');
   },
 
   /**

chrome/browser/resources/settings/passwords_and_forms_page/passwords_section.html

@@ -138,7 +138,8 @@
       </button>
     </cr-action-menu>
     <template is="dom-if" if="[[showPasswordsExportDialog_]]" restamp>
-      <passwords-export-dialog on-close="onPasswordsExportDialogClosed_">
+      <passwords-export-dialog
+          on-passwords-export-dialog-close="onPasswordsExportDialogClosed_">
       </passwords-export-dialog>
     </template>
     <template is="dom-if" if="[[showPasswordEditDialog_]]" restamp>

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

@@ -35,6 +35,7 @@ SettingsPasswordSectionBrowserTest.prototype = {
   /** @override */
   extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([
     'ensure_lazy_loaded.js',
+    'test_util.js',
   ]),
 
   /** @override */
@@ -918,6 +919,26 @@ TEST_F('SettingsPasswordSectionBrowserTest', 'uiTests', function() {
 
       done();
     });
+
+    test('fires close event when canceled', () => {
+      const exportDialog = createExportPasswordsDialog(passwordManager);
+      const wait = test_util.eventToPromise(
+          'passwords-export-dialog-close', exportDialog);
+      exportDialog.$$('#cancelButton').click();
+      return wait;
+    });
+
+    test('fires close event after export complete', () => {
+      const exportDialog = createExportPasswordsDialog(passwordManager);
+      const wait = test_util.eventToPromise(
+          'passwords-export-dialog-close', exportDialog);
+      exportDialog.$$('#exportPasswordsButton').click();
+      passwordManager.progressCallback(
+          {status: chrome.passwordsPrivate.ExportProgressStatus.IN_PROGRESS});
+      passwordManager.progressCallback(
+          {status: chrome.passwordsPrivate.ExportProgressStatus.SUCCEEDED});
+      return wait;
+    });
   });
 
   mocha.run();