WebUI: Rename waitForRender, afterNextRender test helpers.

test_util.waitForRender -> test_util.waitBeforeNextRender
PolymerTest.afterNextRender -> PolymerTest.waitAfterNextRender

This is a preparatory step for exposing these helpers from the
auto-generated test_util.m.js, necessary for testing Polymer3 elements.

Bug: 965770
Change-Id: I6fbee615a19311c534023490222298b4582e3d7e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1744580Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#685332}

chrome/test/data/webui/cr_elements/cr_scrollable_behavior_tests.js

@@ -55,7 +55,7 @@ suite('cr-scrollable-behavior', function() {
     // Wait for CrScrollableBehavior to set the initial scrollable class
     // properties.
     window.requestAnimationFrame(() => {
-      test_util.waitForRender().then(done);
+      test_util.waitBeforeNextRender().then(done);
     });
   });
 

chrome/test/data/webui/cr_focus_row_behavior_test.js

@@ -59,10 +59,10 @@ suite('cr-focus-row-behavior-test', function() {
     document.body.appendChild(testElement);
 
     // Block so that FocusRowBehavior.attached can run.
-    await PolymerTest.afterNextRender(testElement);
+    await PolymerTest.waitAfterNextRender(testElement);
     // Wait one more time to ensure that async setup in FocusRowBehavior has
     // executed.
-    await PolymerTest.afterNextRender(testElement);
+    await PolymerTest.waitAfterNextRender(testElement);
   });
 
   test('item passes focus to first focusable child', function() {

chrome/test/data/webui/extensions/error_console_test.js

@@ -9,7 +9,7 @@ suite('CrExtensionsErrorConsoleTest', function() {
 
   // Initialize an extension activity log item before each test.
   setup(function() {
-    return test_util.waitForRender(document);
+    return test_util.waitBeforeNextRender(document);
   });
 
   test('TestUpDownErrors', function() {

chrome/test/data/webui/history/history_focus_test.js

@@ -122,7 +122,7 @@ TEST_F('HistoryFocusTest', 'All', function() {
 
       // Wait for next render to ensure that focus handlers have been
       // registered (see HistoryItemElement.attached).
-      await PolymerTest.afterNextRender(this);
+      await PolymerTest.waitAfterNextRender(this);
 
       MockInteractions.pressAndReleaseKeyOn(focused, 39, [], 'ArrowRight');
       Polymer.dom.flush();

chrome/test/data/webui/history/history_synced_tabs_test.js

@@ -336,7 +336,8 @@ suite('<history-synced-device-manager>', function() {
     // Should show no synced tabs message on initial load. Regression test for
     // https://crbug.com/915641.
     return Promise
-        .all([PolymerTest.flushTasks(), test_util.waitForRender(element)])
+        .all(
+            [PolymerTest.flushTasks(), test_util.waitBeforeNextRender(element)])
         .then(() => {
           assertNoSyncedTabsMessageShown(element, 'noSyncedResults');
           const cards = getCards(element);

chrome/test/data/webui/multidevice_setup/integration_test.js

@@ -147,7 +147,7 @@ cr.define('multidevice_setup', () => {
       function setVisiblePage(visiblePageName) {
         multiDeviceSetupElement.visiblePageName = visiblePageName;
         Polymer.dom.flush();
-        return test_util.waitForRender(
+        return test_util.waitBeforeNextRender(
             multiDeviceSetupElement.$$(visiblePageName));
       }
 
@@ -158,7 +158,7 @@ cr.define('multidevice_setup', () => {
       function enterPassword(input) {
         multiDeviceSetupElement.$$(PASSWORD).$$('#passwordInput').value = input;
         Polymer.dom.flush();
-        return test_util.waitForRender(multiDeviceSetupElement);
+        return test_util.waitBeforeNextRender(multiDeviceSetupElement);
       }
 
       function getNumSetHostDeviceCalls() {
@@ -342,7 +342,8 @@ cr.define('multidevice_setup', () => {
                   multiDeviceSetupElement.delegate.shouldSetHostSucceed = true;
                   forwardButton.click();
                   Polymer.dom.flush();
-                  return test_util.waitForRender(multiDeviceSetupElement);
+                  return test_util.waitBeforeNextRender(
+                      multiDeviceSetupElement);
                 })
                 .then(() => {
                   assertEquals(
@@ -364,7 +365,8 @@ cr.define('multidevice_setup', () => {
                 .then(() => {
                   forwardButton.click();
                   Polymer.dom.flush();
-                  return test_util.waitForRender(multiDeviceSetupElement);
+                  return test_util.waitBeforeNextRender(
+                      multiDeviceSetupElement);
                 })
                 .then(() => {
                   assertTrue(multiDeviceSetupElement.forwardButtonDisabled);

chrome/test/data/webui/polymer_browser_test_base.js

@@ -215,7 +215,7 @@ PolymerTest.flushTasks = function() {
  * @return {!Promise} Promise that resolves when an afterNextRender()
  *     callback on |element| is run.
  */
-PolymerTest.afterNextRender = function(element) {
+PolymerTest.waitAfterNextRender = function(element) {
   return new Promise(resolve => {
     Polymer.RenderStatus.afterNextRender(element, resolve);
   });

chrome/test/data/webui/print_preview/destination_settings_test.js

@@ -223,7 +223,7 @@ cr.define('destination_settings_test', function() {
 
             // If the user is signed in, Save to Drive should be displayed.
             signIn();
-            return test_util.waitForRender(destinationSettings);
+            return test_util.waitBeforeNextRender(destinationSettings);
           })
           .then(() => {
             assertDropdownItems([
@@ -486,7 +486,7 @@ cr.define('destination_settings_test', function() {
             ]);
 
             dropdown.fire('selected-option-change', 'seeMore');
-            return test_util.waitForRender(destinationSettings);
+            return test_util.waitBeforeNextRender(destinationSettings);
           })
           .then(() => {
             assertTrue(
@@ -541,7 +541,7 @@ cr.define('destination_settings_test', function() {
             ]);
 
             dropdown.fire('selected-option-change', 'seeMore');
-            return test_util.waitForRender(destinationSettings);
+            return test_util.waitBeforeNextRender(destinationSettings);
           })
           .then(() => {
             const dialog =

chrome/test/data/webui/print_preview/invalid_settings_browsertest.js

@@ -158,7 +158,7 @@ cr.define('invalid_settings_browsertest', function() {
       const destinationSettings =
           sidebar.$$('print-preview-destination-settings');
 
-      return test_util.waitForRender(page)
+      return test_util.waitBeforeNextRender(page)
           .then(() => {
             const parentElement =
                 loadTimeData.getBoolean('newPrintPreviewLayoutEnabled') ?
@@ -275,7 +275,7 @@ cr.define('invalid_settings_browsertest', function() {
                                   .$$('print-preview-number-settings-section');
       const layoutSettings = sidebar.$$('print-preview-layout-settings');
 
-      return test_util.waitForRender(page)
+      return test_util.waitBeforeNextRender(page)
           .then(() => {
             const parentElement =
                 loadTimeData.getBoolean('newPrintPreviewLayoutEnabled') ?
@@ -367,7 +367,7 @@ cr.define('invalid_settings_browsertest', function() {
           const destinationSettings =
               sidebar.$$('print-preview-destination-settings');
 
-          return test_util.waitForRender(page)
+          return test_util.waitBeforeNextRender(page)
               .then(() => {
                 const parentElement =
                     loadTimeData.getBoolean('newPrintPreviewLayoutEnabled') ?

chrome/test/data/webui/print_preview/system_dialog_browsertest.js

@@ -46,7 +46,7 @@ cr.define('system_dialog_browsertest', function() {
       sidebar = page.$$('print-preview-sidebar');
       return Promise
           .all([
-            test_util.waitForRender(page),
+            test_util.waitBeforeNextRender(page),
             print_preview.Model.whenReady(),
             nativeLayer.whenCalled('getInitialSettings'),
             nativeLayer.whenCalled('getPrinterCapabilities'),

chrome/test/data/webui/settings/a11y/sign_out_a11y_test.js

@@ -101,7 +101,7 @@ AccessibilityTest.define('SettingsA11ySignOut', {
               parent = this.peoplePage;
               disconnectButtonSelector = '#disconnectButton';
             }
-            return test_util.waitForRender(parent);
+            return test_util.waitBeforeNextRender(parent);
           })
           .then(() => {
             disconnectButton = parent.$$(disconnectButtonSelector);

chrome/test/data/webui/settings/chromeos/quick_unlock_authenticate_browsertest_chromeos.js

@@ -308,7 +308,7 @@ cr.define('settings_people_page_quick_unlock', function() {
                     return true;
                   });
 
-              return test_util.waitForRender(testElement);
+              return test_util.waitBeforeNextRender(testElement);
             })
             .then(() => {
               passwordRadioButton =

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

@@ -76,7 +76,7 @@ cr.define('settings_people_page_sync_page', function() {
       syncPage.set('syncStatus', {supervisedUser: false});
       Polymer.dom.flush();
 
-      return test_util.waitForRender().then(() => {
+      return test_util.waitBeforeNextRender().then(() => {
         encryptWithGoogle =
             syncPage.$$('cr-radio-button[name="encrypt-with-google"]');
         encryptWithPassphrase =
@@ -358,7 +358,7 @@ cr.define('settings_people_page_sync_page', function() {
 
         Polymer.dom.flush();
 
-        return test_util.waitForRender(syncPage).then(() => {
+        return test_util.waitBeforeNextRender(syncPage).then(() => {
           // Need to re-retrieve this, as a different show passphrase radio
           // button is shown once |syncPrefs.fullEncryptionBody| is non-empty.
           encryptWithPassphrase =

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

@@ -842,7 +842,7 @@ suite('SiteList', function() {
     return browserProxy.whenCalled('getExceptionList')
         .then(function(actualContentType) {
           assertEquals(contentType, actualContentType);
-          return test_util.waitForRender(testElement);
+          return test_util.waitBeforeNextRender(testElement);
         })
         .then(function() {
           assertFalse(testElement.$.category.hidden);
@@ -857,7 +857,7 @@ suite('SiteList', function() {
     return browserProxy.whenCalled('getExceptionList')
         .then(function(actualContentType) {
           assertEquals(contentType, actualContentType);
-          return test_util.waitForRender(testElement);
+          return test_util.waitBeforeNextRender(testElement);
         })
         .then(function() {
           assertFalse(testElement.$.category.hidden);
@@ -872,7 +872,7 @@ suite('SiteList', function() {
     return browserProxy.whenCalled('getExceptionList')
         .then(function(actualContentType) {
           assertEquals(contentType, actualContentType);
-          return test_util.waitForRender(testElement);
+          return test_util.waitBeforeNextRender(testElement);
         })
         .then(function() {
           assertFalse(testElement.$.category.hidden);
@@ -887,7 +887,7 @@ suite('SiteList', function() {
     return browserProxy.whenCalled('getExceptionList')
         .then(function(actualContentType) {
           assertEquals(contentType, actualContentType);
-          return test_util.waitForRender(testElement);
+          return test_util.waitBeforeNextRender(testElement);
         })
         .then(function() {
           assertFalse(testElement.$.category.hidden);

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

@@ -57,7 +57,7 @@ suite('ZoomLevels', function() {
     testElement = document.createElement('zoom-levels');
     document.body.appendChild(testElement);
     return browserProxy.whenCalled('fetchZoomLevels').then(() => {
-      return test_util.waitForRender(testElement);
+      return test_util.waitBeforeNextRender(testElement);
     });
   }
 

chrome/test/data/webui/test_util.js

@@ -76,7 +76,7 @@ cr.define('test_util', function() {
    * @param {!Element} element
    * @return {!Promise}
    */
-  /* #export */ function waitForRender(element) {
+  /* #export */ function waitBeforeNextRender(element) {
     return new Promise(resolve => {
       Polymer.RenderStatus.beforeNextRender(element, resolve);
     });
@@ -86,7 +86,7 @@ cr.define('test_util', function() {
   return {
     eventToPromise: eventToPromise,
     fakeDataBind: fakeDataBind,
-    waitForRender: waitForRender,
+    waitBeforeNextRender: waitBeforeNextRender,
     whenAttributeIs: whenAttributeIs,
   };
 });

chrome/test/data/webui/welcome/welcome_app_test.js

@@ -71,7 +71,7 @@ cr.define('onboarding_welcome_app_test', function() {
     test('new user route (can set default)', function() {
       simulateCanSetDefault();
       welcome.navigateTo(welcome.Routes.NEW_USER, 1);
-      return test_util.waitForRender(testElement).then(() => {
+      return test_util.waitBeforeNextRender(testElement).then(() => {
         const views = testElement.shadowRoot.querySelectorAll('[slot=view]');
         assertEquals(views.length, 5);
         ['LANDING-VIEW',
@@ -88,7 +88,7 @@ cr.define('onboarding_welcome_app_test', function() {
     test('new user route (cannot set default)', function() {
       simulateCannotSetDefault();
       welcome.navigateTo(welcome.Routes.NEW_USER, 1);
-      return test_util.waitForRender(testElement).then(() => {
+      return test_util.waitBeforeNextRender(testElement).then(() => {
         const views = testElement.shadowRoot.querySelectorAll('[slot=view]');
         assertEquals(views.length, 4);
         ['LANDING-VIEW',
@@ -104,7 +104,7 @@ cr.define('onboarding_welcome_app_test', function() {
     test('returning user route (can set default)', function() {
       simulateCanSetDefault();
       welcome.navigateTo(welcome.Routes.RETURNING_USER, 1);
-      return test_util.waitForRender(testElement).then(() => {
+      return test_util.waitBeforeNextRender(testElement).then(() => {
         const views = testElement.shadowRoot.querySelectorAll('[slot=view]');
         assertEquals(views.length, 2);
         assertEquals(views[0].tagName, 'LANDING-VIEW');
@@ -134,7 +134,7 @@ cr.define('onboarding_welcome_app_test', function() {
         // Use the new-user route to test if nux-set-as-default module gets
         // initialized.
         welcome.navigateTo(welcome.Routes.NEW_USER, 1);
-        return test_util.waitForRender(testElement).then(() => {
+        return test_util.waitBeforeNextRender(testElement).then(() => {
           // Use the existence of the nux-set-as-default as indication of
           // whether or not the promise is resolved with the expected result.
           assertEquals(