MD Settings: Hook up reset_page to new LifetimeBrowserProxy.

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, [
       'performResetProfileSettings',
       'onHideResetProfileDialog',
       'onHideResetProfileBanner',
       'onShowResetProfileDialog',
       'showReportedSettings',
       'onPowerwashDialogShow',
-      'requestFactoryResetRestart',
     ]);
   };
 
   TestResetBrowserProxy.prototype = {
     __proto__: settings.TestBrowserProxy.prototype,
 
     /** @override */
     performResetProfileSettings: function(sendSettings) {
       this.methodCalled('performResetProfileSettings');
       return Promise.resolve();
@@ skipping 16 matching lines @@
 
     /** @override */
     showReportedSettings: function() {
       this.methodCalled('showReportedSettings');
     },
 
     /** @override */
     onPowerwashDialogShow: function() {
       this.methodCalled('onPowerwashDialogShow');
     },
-
-    /** @override */
-    requestFactoryResetRestart: function() {
-      this.methodCalled('requestFactoryResetRestart');
-    },
   };
 
   function registerBannerTests() {
     suite('BannerTests', function() {
       var resetBanner = null;
       var browserProxy = null;
 
       suiteSetup(function() {
         return PolymerTest.importHtml(
             'chrome://md-settings/reset_page/reset_profile_banner.html');
@@ skipping 34 matching lines @@
         assertFalse(!!resetBanner.parentNode);
         return browserProxy.whenCalled('onHideResetProfileBanner');
       });
     });
   }
 
   function registerDialogTests() {
     suite('DialogTests', function() {
       var resetPage = null;
 
+      /** @type {!settings.ResetPageBrowserProxy} */
+      var resetPageBrowserProxy = null;
+
+      /** @type {!settings.LifetimeBrowserProxy} */
+      var lifetimeBrowserProxy = null;

[tommycli, 2016/06/13 22:48:16]

Should this only be created on cr.isChromeOS only? I am not sure myself, just a
suggestion.

[dpapad, 2016/06/13 23:02:27]

I thought about this (and also tried it). IMO it looks odd to put the variable
declaration inside an if statement (and can be confusing to future readers who
are not familiar with JS Hoisting, http://www.w3schools.com/js/js_hoisting.asp).
So I think initializing to null, and never assigning a non-null value on
non-ChromeOS is less odd.

+
       setup(function() {
-        browserProxy = new TestResetBrowserProxy();
-        settings.ResetBrowserProxyImpl.instance_ = browserProxy;
+        if (cr.isChromeOS) {
+          lifetimeBrowserProxy = new settings.TestLifetimeBrowserProxy();
+          settings.LifetimeBrowserProxyImpl.instance_ = lifetimeBrowserProxy;
+        }
+
+        resetPageBrowserProxy = new TestResetBrowserProxy();
+        settings.ResetBrowserProxyImpl.instance_ = resetPageBrowserProxy;
+
         PolymerTest.clearBody();
         resetPage = document.createElement('settings-reset-page');
         document.body.appendChild(resetPage);
       });
 
       teardown(function() { resetPage.remove(); });
 
       /**
        * @param {function(SettingsResetProfileDialogElemeent)}
        *     closeDialogFn A function to call for closing the dialog.
        * @return {!Promise}
        */
       function testOpenCloseResetProfileDialog(closeDialogFn) {
-        browserProxy.resetResolver('onShowResetProfileDialog');
-        browserProxy.resetResolver('onHideResetProfileDialog');
+        resetPageBrowserProxy.resetResolver('onShowResetProfileDialog');
+        resetPageBrowserProxy.resetResolver('onHideResetProfileDialog');
 
         // Open reset profile dialog.
         MockInteractions.tap(resetPage.$.resetProfile);
         var dialog = resetPage.$$('settings-reset-profile-dialog');
         assertTrue(!!dialog);
         var onDialogClosed = new Promise(
             function(resolve, reject) {
               dialog.addEventListener('iron-overlay-closed', resolve);
             });
 
-        return browserProxy.whenCalled('onShowResetProfileDialog').then(
+        return resetPageBrowserProxy.whenCalled(
+            'onShowResetProfileDialog').then(
             function() {
               closeDialogFn(dialog);
               return Promise.all([
                 onDialogClosed,
-                browserProxy.whenCalled('onHideResetProfileDialog'),
+                resetPageBrowserProxy.whenCalled('onHideResetProfileDialog'),
               ]);
             });
       }
 
       // Tests that the reset profile dialog opens and closes correctly and that
-      // browserProxy calls are occurring as expected.
+      // resetPageBrowserProxy calls are occurring as expected.
       test(TestNames.ResetProfileDialogOpenClose, function() {
         return Promise.all([
           // Test case where the 'cancel' button is clicked.
           testOpenCloseResetProfileDialog(
               function(dialog) {
                 MockInteractions.tap(dialog.$.cancel);
               }),
           // Test case where the 'close' button is clicked.
           testOpenCloseResetProfileDialog(
               function(dialog) {
@@ skipping 13 matching lines @@
       test(TestNames.ResetProfileDialogAction, function() {
         // Open reset profile dialog.
         MockInteractions.tap(resetPage.$.resetProfile);
         var dialog = resetPage.$$('settings-reset-profile-dialog');
         assertTrue(!!dialog);
 
         var showReportedSettingsLink = dialog.$$('.footer a');
         assertTrue(!!showReportedSettingsLink);
         MockInteractions.tap(showReportedSettingsLink);
 
-        return browserProxy.whenCalled('showReportedSettings').then(function() {
-          MockInteractions.tap(dialog.$.reset);
-          return browserProxy.whenCalled('performResetProfileSettings');
-        });
+        return resetPageBrowserProxy.whenCalled('showReportedSettings').then(
+            function() {
+              MockInteractions.tap(dialog.$.reset);
+              return resetPageBrowserProxy.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) {
           // Open powerwash dialog.
           MockInteractions.tap(resetPage.$.powerwash);
           var dialog = resetPage.$$('settings-powerwash-dialog');
           assertTrue(!!dialog);
           var onDialogClosed = new Promise(
               function(resolve, reject) {
                 dialog.addEventListener('iron-overlay-closed', resolve);
               });
 
           MockInteractions.tap(closeButtonFn(dialog));
           return Promise.all([
               onDialogClosed,
-              browserProxy.whenCalled('onPowerwashDialogShow'),
+              resetPageBrowserProxy.whenCalled('onPowerwashDialogShow'),
           ]);
         }
 
         // Tests that the powerwash dialog opens and closes correctly, and
         // that chrome.send calls are propagated as expected.
         test(TestNames.PowerwashDialogOpenClose, function() {
           return Promise.all([
             // Test case where the 'cancel' button is clicked.
             testOpenClosePowerwashDialog(
                 function(dialog) { return dialog.$.cancel; }),
             // Test case where the 'close' button is clicked.
             testOpenClosePowerwashDialog(
                 function(dialog) { return dialog.$.dialog.getCloseButton(); }),
           ]);
         });
 
         // Tests that when powerwash is requested chrome.send calls are
         // propagated as expected.
         test(TestNames.PowerwashDialogAction, function() {
           // Open powerwash dialog.
           MockInteractions.tap(resetPage.$.powerwash);
           var dialog = resetPage.$$('settings-powerwash-dialog');
           assertTrue(!!dialog);
           MockInteractions.tap(dialog.$.powerwash);
-          return browserProxy.whenCalled('requestFactoryResetRestart');
+          return lifetimeBrowserProxy.whenCalled('factoryReset');
         });
       }
     });
   }
 
   return {
     registerTests: function() {
-      registerBannerTests();
+      //registerBannerTests();

[tommycli, 2016/06/13 22:48:17]

nit: is this a leftover?

[dpapad, 2016/06/13 23:02:27]

Oops, yes this should not be commented out, reverted.

       registerDialogTests();
     },
   };
 });