md-settings: Fix back navigation from /resetProfileSettings.

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

 // Copyright 2015 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_reset_page', function() {
   /** @enum {string} */
   var TestNames = {
     PowerwashDialogAction: 'PowerwashDialogAction',
     PowerwashDialogOpenClose: 'PowerwashDialogOpenClose',
     ResetBannerClose: 'ResetBannerClose',
@@ skipping 68 matching lines @@
         settings.ResetBrowserProxyImpl.instance_ = browserProxy;
         PolymerTest.clearBody();
         resetBanner = document.createElement('settings-reset-profile-banner');
         document.body.appendChild(resetBanner);
       });
 
       teardown(function() { resetBanner.remove(); });
 
       // Tests that the reset profile banner
       //  - opens the reset profile dialog when the reset button is clicked.
+      //  - reset happens when clicking on the dialog's reset button.
       //  - the reset profile dialog is closed after reset is done.
       test(TestNames.ResetBannerReset, function() {
         var dialog = resetBanner.$$('settings-reset-profile-dialog');
         assertFalse(!!dialog);
-        MockInteractions.tap(resetBanner.$['reset']);
+        MockInteractions.tap(resetBanner.$.reset);
         Polymer.dom.flush();
+        assertTrue(resetBanner.showResetProfileDialog_)
         dialog = resetBanner.$$('settings-reset-profile-dialog');
         assertTrue(!!dialog);
 
-        dialog.fire('reset-done');
-        Polymer.dom.flush();
-        assertEquals('none', dialog.style.display);
-        return Promise.resolve();
+        MockInteractions.tap(dialog.$.reset);
+
+        return browserProxy.whenCalled('performResetProfileSettings')
+            .then(PolymerTest.flushTasks)
+            .then(function() {
+              assertFalse(resetBanner.showResetProfileDialog_);
+              dialog = resetBanner.$$('settings-reset-profile-dialog');
+              assertFalse(!!dialog);
+            });
       });
 
       // Tests that the reset profile banner removes itself from the DOM when
       // the close button is clicked and that |onHideResetProfileBanner| is
       // called.
       test(TestNames.ResetBannerClose, function() {
-        MockInteractions.tap(resetBanner.$['close']);
+        MockInteractions.tap(resetBanner.$.close);
         assertFalse(!!resetBanner.parentNode);
         return browserProxy.whenCalled('onHideResetProfileBanner');
       });
     });
   }
 
   function registerDialogTests() {
     suite('DialogTests', function() {
       var resetPage = null;
 
@@ skipping 34 matching lines @@
         var dialog = resetPage.$$('settings-reset-profile-dialog');
         assertTrue(!!dialog);
         var onDialogClosed = new Promise(
             function(resolve, reject) {
               dialog.addEventListener('close', function() {
                 assertFalse(dialog.$.dialog.open);
                 resolve();
               });
             });
 
-        return resetPageBrowserProxy.whenCalled(
-              'onShowResetProfileDialog').then(function() {
-          assertTrue(dialog.$.dialog.open);
-          closeDialogFn(dialog);
-          return Promise.all([
-            onDialogClosed,
-            resetPageBrowserProxy.whenCalled('onHideResetProfileDialog'),
-          ]);
+        return PolymerTest.flushTasks().then(function() {
+          resetPageBrowserProxy.whenCalled('onShowResetProfileDialog')
+              .then(function() {
+                assertTrue(dialog.$.dialog.open);
+                closeDialogFn(dialog);
+                return Promise.all([
+                  onDialogClosed,
+                  resetPageBrowserProxy.whenCalled('onHideResetProfileDialog'),
+                ]);
+              });
         });
       }
 
       // Tests that the reset profile dialog opens and closes correctly and that
       // resetPageBrowserProxy calls are occurring as expected.
       test(TestNames.ResetProfileDialogOpenClose, function() {
         return testOpenCloseResetProfileDialog(function(dialog) {
           // Test case where the 'cancel' button is clicked.
           MockInteractions.tap(dialog.$.cancel);
-        }).then(function() {
+        }).then(PolymerTest.flushTasks).then(function() {
           return testOpenCloseResetProfileDialog(function(dialog) {
             // Test case where the 'close' button is clicked.
             MockInteractions.tap(dialog.$.dialog.getCloseButton());
           });
         });
       });
 
       // Tests that when user request to reset the profile the appropriate
       // message is sent to the browser.
       test(TestNames.ResetProfileDialogAction, function() {
@@ skipping 78 matching lines @@
     });
   }
 
   return {
     registerTests: function() {
       registerBannerTests();
       registerDialogTests();
     },
   };
 });