Settings WebUI: Dismiss "reset profile" dialog on back navigation.

Bug: 822640
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I34936fa59d5f930250a12619674f4be1ee5c767c
Reviewed-on: https://chromium-review.googlesource.com/966996Reviewed-by: Scott Chen <scottchen@chromium.org>
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#544213}

chrome/browser/resources/settings/reset_page/compiled_resources2.gyp

@@ -15,6 +15,7 @@
       'target_name': 'reset_page',
       'dependencies': [
         '../compiled_resources2.gyp:route',
+        '<(DEPTH)/ui/webui/resources/cr_elements/cr_lazy_render/compiled_resources2.gyp:cr_lazy_render',
         '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:assert',
         '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr',
         '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:load_time_data',

chrome/browser/resources/settings/reset_page/reset_page.js

@@ -57,11 +57,18 @@ Polymer({
    * @protected
    */
   currentRouteChanged: function(route) {
+    const lazyRender =
+        /** @type {!CrLazyRenderElement} */ (this.$.resetProfileDialog);
+
     if (route == settings.routes.TRIGGERED_RESET_DIALOG ||
         route == settings.routes.RESET_DIALOG) {
-      /** @type {!SettingsResetProfileDialogElement} */ (
-          this.$.resetProfileDialog.get())
+      /** @type {!SettingsResetProfileDialogElement} */ (lazyRender.get())
           .show();
+    } else {
+      const dialog = /** @type {?SettingsResetProfileDialogElement} */ (
+          lazyRender.getIfExists());
+      if (dialog)
+        dialog.cancel();
     }
   },
 

chrome/browser/resources/settings/reset_page/reset_profile_dialog.js

@@ -115,7 +115,12 @@ Polymer({
 
   /** @private */
   onCancelTap_: function() {
-    this.$.dialog.cancel();
+    this.cancel();
+  },
+
+  cancel: function() {
+    if (this.$.dialog.open)
+      this.$.dialog.cancel();
   },
 
   /** @private */

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

@@ -75,11 +75,16 @@ cr.define('settings_reset_page', function() {
         return testOpenCloseResetProfileDialog(function(dialog) {
           // Test case where the 'cancel' button is clicked.
           MockInteractions.tap(dialog.$.cancel);
-        }).then(PolymerTest.flushTasks).then(function() {
+        }).then(function() {
           return testOpenCloseResetProfileDialog(function(dialog) {
             // Test case where the 'close' button is clicked.
             MockInteractions.tap(dialog.$.dialog.getCloseButton());
           });
+        }).then(function() {
+          return testOpenCloseResetProfileDialog(function(dialog) {
+            // Test case where the browser's 'back' button is clicked.
+            resetPage.currentRouteChanged(settings.routes.BASIC);
+          });
         });
       });