MD Settings: Reset profile dialog, display settings in new tab.

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',
     ResetBannerReset: 'ResetBannerReset',
     ResetProfileDialogAction: 'ResetProfileDialogAction',
     ResetProfileDialogOpenClose: 'ResetProfileDialogOpenClose',
   };
 
   /**
    * @constructor
    * @implements {settings.ResetBrowserProxy}
    * @extends {settings.TestBrowserProxy}
    */
   var TestResetBrowserProxy = function() {
     settings.TestBrowserProxy.call(this, [
+      'getReportedSettings',

[tommycli, 2016/04/20 23:23:18]

Why the re-order? In the proxy implementation, 'getReportedSettings' is below
'onShowReset' right?

[dpapad, 2016/04/21 00:27:10]

Reverted the re-ordering.

+      'onHideResetProfileBanner',
+      'onHideResetProfileDialog',
+      'onPowerwashDialogShow',
+      'onShowResetProfileDialog',
       'performResetProfileSettings',
-      'onHideResetProfileDialog',
-      'onHideResetProfileBanner',
-      'onShowResetProfileDialog',
-      'onPowerwashDialogShow',
       'requestFactoryResetRestart',
     ]);
   };
 
   TestResetBrowserProxy.prototype = {
     __proto__: settings.TestBrowserProxy.prototype,
 
     /** @override */
+    getReportedSettings: function() {

[tommycli, 2016/04/20 23:23:18]

nit: Same ordering as proxy impl

[dpapad, 2016/04/21 00:27:10]

Done.

+      this.methodCalled('getReportedSettings');
+      return Promise.resolve([]);
+    },
+
+    /** @override */
     performResetProfileSettings: function(sendSettings) {
       this.methodCalled('performResetProfileSettings');
       return Promise.resolve();
     },
 
     /** @override */
     onHideResetProfileDialog: function() {
       this.methodCalled('onHideResetProfileDialog');
     },
 
@@ skipping 131 matching lines @@
         ]);
       });
 
       // Tests that when user request to reset the profile the appropriate
       // message is sent to the browser.
       test(TestNames.ResetProfileDialogAction, function() {
         // Open reset profile dialog.
         MockInteractions.tap(resetPage.$.resetProfile);
         var dialog = resetPage.$$('settings-reset-profile-dialog');
         assertTrue(!!dialog);
-        MockInteractions.tap(dialog.$.reset);
-        return browserProxy.whenCalled('performResetProfileSettings');
+
+        var showReportedSettingsButton = dialog.$$('iron-icon');
+        assertTrue(!!showReportedSettingsButton);
+        MockInteractions.tap(showReportedSettingsButton);
+
+        return browserProxy.whenCalled('getReportedSettings').then(function() {
+          MockInteractions.tap(dialog.$.reset);
+          return browserProxy.whenCalled('performResetProfileSettings');
+        });
       });
 
       if (cr.isChromeOS) {
         /**
          * @param {function(SettingsPowerwashDialogElemeent):!Element}
          *     closeButtonFn A function that returns the button to be used for
          *     closing the dialog.
          * @return {!Promise}
          */
         function testOpenClosePowerwashDialog(closeButtonFn) {
@@ skipping 40 matching lines @@
     });
   }
 
   return {
     registerTests: function() {
       registerBannerTests();
       registerDialogTests();
     },
   };
 });