PDF Viewer: Remove unnecessary test helper testAsync().

Instead, the "async" keyword is directly used on the functions that are
passed to the testing framework.

Bug: None
Change-Id: Ife6c66a85cf60cf2bc3d9ec47a33d088c44b38ee
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2531861
Commit-Queue: dpapad <dpapad@chromium.org>
Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#826708}

chrome/test/data/pdf/BUILD.gn

@@ -117,7 +117,6 @@ js_library("material_elements_test") {
 
 js_library("download_controls_test") {
   deps = [
-    ":test_util",
     "//chrome/browser/resources/pdf:constants",
     "//chrome/browser/resources/pdf/elements:viewer-download-controls",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
@@ -202,7 +201,6 @@ js_library("viewer_pdf_toolbar_new_test") {
 
 js_library("viewer_thumbnail_bar_test") {
   deps = [
-    ":test_util",
     "../webui:test_util.m",
     "//chrome/browser/resources/pdf:controller",
     "//chrome/browser/resources/pdf/elements:viewer-thumbnail",

chrome/test/data/pdf/annotations_toolbar_test.js

@@ -5,8 +5,6 @@
 import {eventToPromise, waitBeforeNextRender} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/_test_resources/webui/test_util.m.js';
 import {ViewerPdfToolbarNewElement} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/elements/viewer-pdf-toolbar-new.js';
 
-import {testAsync, waitFor} from './test_util.js';
-
 /** @return {!ViewerPdfToolbarNewElement} */
 function createToolbar() {
   document.body.innerHTML = '';
@@ -18,20 +16,17 @@ function createToolbar() {
 
 const tests = [
   function testHidingAnnotationsExitsAnnotationsMode() {
-    testAsync(async () => {
-      const toolbar = createToolbar();
-      toolbar.toggleAnnotation();
-      // This is normally done by the parent in response to the event fired by
-      // toggleAnnotation().
-      toolbar.annotationMode = true;
+    const toolbar = createToolbar();
+    toolbar.toggleAnnotation();
+    // This is normally done by the parent in response to the event fired by
+    // toggleAnnotation().
+    toolbar.annotationMode = true;
 
-      await toolbar.addEventListener('display-annotations-changed', async e => {
-        chrome.test.assertFalse(e.detail);
-        await waitFor(() => toolbar.annotationMode === false);
-        chrome.test.succeed();
-      });
-      toolbar.shadowRoot.querySelector('#show-annotations-button').click();
+    toolbar.addEventListener('display-annotations-changed', async e => {
+      chrome.test.assertFalse(e.detail);
+      chrome.test.succeed();
     });
+    toolbar.shadowRoot.querySelector('#show-annotations-button').click();
   },
   function testEnteringAnnotationsModeShowsAnnotations() {
     const toolbar = createToolbar();
@@ -58,60 +53,57 @@ const tests = [
         toolbar.shadowRoot.querySelector('#two-page-view-button').disabled);
     chrome.test.succeed();
   },
-  function testRotateOrTwoUpViewTriggersDialog() {
+  async function testRotateOrTwoUpViewTriggersDialog() {
     const toolbar = createToolbar();
     toolbar.annotationAvailable = true;
     toolbar.pdfAnnotationsEnabled = true;
     toolbar.rotated = false;
     toolbar.twoUpViewEnabled = false;
 
-    testAsync(async () => {
-      await waitBeforeNextRender(toolbar);
-      chrome.test.assertFalse(toolbar.annotationMode);
+    await waitBeforeNextRender(toolbar);
+    chrome.test.assertFalse(toolbar.annotationMode);
 
-      // If rotation is enabled clicking the button shows the dialog.
-      toolbar.rotated = true;
-      const annotateButton = toolbar.shadowRoot.querySelector('#annotate');
-      chrome.test.assertFalse(annotateButton.disabled);
-      annotateButton.click();
-      await waitBeforeNextRender(toolbar);
-      let dialog =
-          toolbar.shadowRoot.querySelector('viewer-annotations-mode-dialog');
-      chrome.test.assertTrue(dialog.isOpen());
+    // If rotation is enabled clicking the button shows the dialog.
+    toolbar.rotated = true;
+    const annotateButton = toolbar.shadowRoot.querySelector('#annotate');
+    chrome.test.assertFalse(annotateButton.disabled);
+    annotateButton.click();
+    await waitBeforeNextRender(toolbar);
+    let dialog =
+        toolbar.shadowRoot.querySelector('viewer-annotations-mode-dialog');
+    chrome.test.assertTrue(dialog.isOpen());
 
-      // Cancel the dialog.
-      const whenClosed = eventToPromise('close', dialog);
-      dialog.shadowRoot.querySelector('.cancel-button').click();
-      chrome.test.assertFalse(dialog.isOpen());
-      await whenClosed;
+    // Cancel the dialog.
+    const whenClosed = eventToPromise('close', dialog);
+    dialog.shadowRoot.querySelector('.cancel-button').click();
+    chrome.test.assertFalse(dialog.isOpen());
+    await whenClosed;
 
-      // If both two up and rotate are enabled, the dialog opens.
-      toolbar.twoUpViewEnabled = true;
-      chrome.test.assertFalse(annotateButton.disabled);
-      annotateButton.click();
-      await waitBeforeNextRender(toolbar);
-      dialog =
-          toolbar.shadowRoot.querySelector('viewer-annotations-mode-dialog');
-      chrome.test.assertTrue(dialog.isOpen());
+    // If both two up and rotate are enabled, the dialog opens.
+    toolbar.twoUpViewEnabled = true;
+    chrome.test.assertFalse(annotateButton.disabled);
+    annotateButton.click();
+    await waitBeforeNextRender(toolbar);
+    dialog = toolbar.shadowRoot.querySelector('viewer-annotations-mode-dialog');
+    chrome.test.assertTrue(dialog.isOpen());
 
-      // When "Edit" is clicked, the toolbar should fire
-      // annotation-mode-dialog-confirmed.
-      const whenConfirmed =
-          eventToPromise('annotation-mode-dialog-confirmed', toolbar);
-      dialog.shadowRoot.querySelector('.action-button').click();
-      await whenConfirmed;
-      chrome.test.assertFalse(dialog.isOpen());
-      await waitBeforeNextRender(toolbar);
+    // When "Edit" is clicked, the toolbar should fire
+    // annotation-mode-dialog-confirmed.
+    const whenConfirmed =
+        eventToPromise('annotation-mode-dialog-confirmed', toolbar);
+    dialog.shadowRoot.querySelector('.action-button').click();
+    await whenConfirmed;
+    chrome.test.assertFalse(dialog.isOpen());
+    await waitBeforeNextRender(toolbar);
 
-      // Dialog shows in two up view (un-rotated).
-      toolbar.rotated = false;
-      chrome.test.assertFalse(annotateButton.disabled);
-      annotateButton.click();
-      await waitBeforeNextRender(toolbar);
-      dialog =
-          toolbar.shadowRoot.querySelector('viewer-annotations-mode-dialog');
-      chrome.test.assertTrue(dialog.isOpen());
-    });
+    // Dialog shows in two up view (un-rotated).
+    toolbar.rotated = false;
+    chrome.test.assertFalse(annotateButton.disabled);
+    annotateButton.click();
+    await waitBeforeNextRender(toolbar);
+    dialog = toolbar.shadowRoot.querySelector('viewer-annotations-mode-dialog');
+    chrome.test.assertTrue(dialog.isOpen());
+    chrome.test.succeed();
   }
 ];
 

chrome/test/data/pdf/download_controls_test.js

@@ -7,14 +7,12 @@ import {ViewerDownloadControlsElement} from 'chrome-extension://mhjfbmdgcfjbbpae
 import {listenOnce} from 'chrome://resources/js/util.m.js';
 import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
-import {testAsync} from './test_util.js';
-
 const tests = [
   /**
    * Test that the toolbar shows an option to download the edited PDF if
    * available.
    */
-  function testEditedPdfOption() {
+  async function testEditedPdfOption() {
     document.body.innerHTML = '';
     /** @type {!ViewerDownloadControlsElement} */
     const downloadsElement = /** @type {!ViewerDownloadControlsElement} */ (
@@ -50,80 +48,79 @@ const tests = [
               downloadsElement, 'download-menu-shown-for-testing', resolve));
     };
 
-    testAsync(async () => {
-      // No edits, and feature is off.
-      let onSave = whenSave();
-      downloadButton.click();
-      let requestType = await onSave;
-      chrome.test.assertFalse(actionMenu.open);
-      chrome.test.assertEq(SaveRequestType.ORIGINAL, requestType);
-      chrome.test.assertEq(1, numRequests);
-
-      // Still does not show the menu if there are no edits.
-      downloadsElement.pdfFormSaveEnabled = true;
-      onSave = whenSave();
-      downloadButton.click();
-      requestType = await onSave;
-      chrome.test.assertFalse(actionMenu.open);
-      chrome.test.assertEq(SaveRequestType.ORIGINAL, requestType);
-      chrome.test.assertEq(2, numRequests);
-
-      // Set form field focused.
-      downloadsElement.isFormFieldFocused = true;
-      onSave = whenSave();
-      downloadButton.click();
-
-      // Unfocus, without making any edits. Saves the original document.
-      downloadsElement.isFormFieldFocused = false;
-      requestType = await onSave;
-      chrome.test.assertFalse(actionMenu.open);
-      chrome.test.assertEq(SaveRequestType.ORIGINAL, requestType);
-      chrome.test.assertEq(3, numRequests);
-
-      // Focus again.
-      downloadsElement.isFormFieldFocused = true;
-      downloadButton.click();
-
-      // Set editing mode and change the form focus. Now, the menu should
-      // open.
-      downloadsElement.hasEdits = true;
-      downloadsElement.isFormFieldFocused = false;
-      await whenDownloadMenuShown();
-      chrome.test.assertTrue(actionMenu.open);
-      chrome.test.assertEq(3, numRequests);
-
-      // Click on "Edited".
-      const buttons = downloadsElement.shadowRoot.querySelectorAll('button');
-      onSave = whenSave();
-      buttons[0].click();
-      requestType = await onSave;
-      chrome.test.assertEq(SaveRequestType.EDITED, requestType);
-      chrome.test.assertFalse(actionMenu.open);
-      chrome.test.assertEq(4, numRequests);
-
-      // Click again to re-open menu.
-      downloadButton.click();
-      await whenDownloadMenuShown();
-      chrome.test.assertTrue(actionMenu.open);
-
-      // Click on "Original".
-      onSave = whenSave();
-      buttons[1].click();
-      requestType = await onSave;
-      chrome.test.assertEq(SaveRequestType.ORIGINAL, requestType);
-      chrome.test.assertFalse(actionMenu.open);
-      chrome.test.assertEq(5, numRequests);
-
-      // Even if the document has been edited, always download the original
-      // if the feature flag is off.
-      downloadsElement.pdfFormSaveEnabled = false;
-      onSave = whenSave();
-      downloadButton.click();
-      requestType = await onSave;
-      chrome.test.assertFalse(actionMenu.open);
-      chrome.test.assertEq(SaveRequestType.ORIGINAL, requestType);
-      chrome.test.assertEq(6, numRequests);
-    });
+    // No edits, and feature is off.
+    let onSave = whenSave();
+    downloadButton.click();
+    let requestType = await onSave;
+    chrome.test.assertFalse(actionMenu.open);
+    chrome.test.assertEq(SaveRequestType.ORIGINAL, requestType);
+    chrome.test.assertEq(1, numRequests);
+
+    // Still does not show the menu if there are no edits.
+    downloadsElement.pdfFormSaveEnabled = true;
+    onSave = whenSave();
+    downloadButton.click();
+    requestType = await onSave;
+    chrome.test.assertFalse(actionMenu.open);
+    chrome.test.assertEq(SaveRequestType.ORIGINAL, requestType);
+    chrome.test.assertEq(2, numRequests);
+
+    // Set form field focused.
+    downloadsElement.isFormFieldFocused = true;
+    onSave = whenSave();
+    downloadButton.click();
+
+    // Unfocus, without making any edits. Saves the original document.
+    downloadsElement.isFormFieldFocused = false;
+    requestType = await onSave;
+    chrome.test.assertFalse(actionMenu.open);
+    chrome.test.assertEq(SaveRequestType.ORIGINAL, requestType);
+    chrome.test.assertEq(3, numRequests);
+
+    // Focus again.
+    downloadsElement.isFormFieldFocused = true;
+    downloadButton.click();
+
+    // Set editing mode and change the form focus. Now, the menu should
+    // open.
+    downloadsElement.hasEdits = true;
+    downloadsElement.isFormFieldFocused = false;
+    await whenDownloadMenuShown();
+    chrome.test.assertTrue(actionMenu.open);
+    chrome.test.assertEq(3, numRequests);
+
+    // Click on "Edited".
+    const buttons = downloadsElement.shadowRoot.querySelectorAll('button');
+    onSave = whenSave();
+    buttons[0].click();
+    requestType = await onSave;
+    chrome.test.assertEq(SaveRequestType.EDITED, requestType);
+    chrome.test.assertFalse(actionMenu.open);
+    chrome.test.assertEq(4, numRequests);
+
+    // Click again to re-open menu.
+    downloadButton.click();
+    await whenDownloadMenuShown();
+    chrome.test.assertTrue(actionMenu.open);
+
+    // Click on "Original".
+    onSave = whenSave();
+    buttons[1].click();
+    requestType = await onSave;
+    chrome.test.assertEq(SaveRequestType.ORIGINAL, requestType);
+    chrome.test.assertFalse(actionMenu.open);
+    chrome.test.assertEq(5, numRequests);
+
+    // Even if the document has been edited, always download the original
+    // if the feature flag is off.
+    downloadsElement.pdfFormSaveEnabled = false;
+    onSave = whenSave();
+    downloadButton.click();
+    requestType = await onSave;
+    chrome.test.assertFalse(actionMenu.open);
+    chrome.test.assertEq(SaveRequestType.ORIGINAL, requestType);
+    chrome.test.assertEq(6, numRequests);
+    chrome.test.succeed();
   },
 ];
 

chrome/test/data/pdf/navigator_test.js

@@ -7,7 +7,7 @@ import {NavigatorDelegate, PdfNavigator, WindowOpenDisposition} from 'chrome-ext
 import {OpenPdfParamsParser} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/open_pdf_params_parser.js';
 import {PDFScriptingAPI} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_scripting_api.js';
 
-import {getZoomableViewport, MockDocumentDimensions, MockElement, MockSizer, MockViewportChangedCallback, testAsync} from './test_util.js';
+import {getZoomableViewport, MockDocumentDimensions, MockElement, MockSizer, MockViewportChangedCallback} from './test_util.js';
 
 /** @implements {NavigatorDelegate} */
 class MockNavigatorDelegate {
@@ -121,7 +121,7 @@ const tests = [
    * Test navigation within the page, opening a url in the same tab and
    * opening a url in a new tab.
    */
-  function testNavigate() {
+  async function testNavigate() {
     const mockWindow = new MockElement(100, 100, null);
     const mockSizer = new MockSizer();
     const mockCallback = new MockViewportChangedCallback();
@@ -153,54 +153,53 @@ const tests = [
     viewport.setDocumentDimensions(documentDimensions);
     viewport.setZoom(1);
 
-    testAsync(async () => {
-      mockCallback.reset();
-      let navigatingDone =
-          eventToPromise('navigate-for-testing', navigator.getEventTarget());
-      // This should move viewport to page 0.
-      navigator.navigate(url + '#US', WindowOpenDisposition.CURRENT_TAB);
-      await navigatingDone;
-      chrome.test.assertTrue(mockCallback.wasCalled);
-      chrome.test.assertEq(0, viewport.position.x);
-      chrome.test.assertEq(0, viewport.position.y);
-
-      mockCallback.reset();
-      navigatorDelegate.reset();
-      navigatingDone =
-          eventToPromise('navigate-for-testing', navigator.getEventTarget());
-      // This should open "http://xyz.pdf#US" in a new tab. So current tab
-      // viewport should not update and viewport position should remain same.
-      navigator.navigate(url + '#US', WindowOpenDisposition.NEW_BACKGROUND_TAB);
-      await navigatingDone;
-      chrome.test.assertFalse(mockCallback.wasCalled);
-      chrome.test.assertTrue(navigatorDelegate.navigateInNewTabCalled);
-      chrome.test.assertEq(0, viewport.position.x);
-      chrome.test.assertEq(0, viewport.position.y);
-
-      mockCallback.reset();
-      navigatingDone =
-          eventToPromise('navigate-for-testing', navigator.getEventTarget());
-      // This should move viewport to page 2.
-      navigator.navigate(url + '#UY', WindowOpenDisposition.CURRENT_TAB);
-      await navigatingDone;
-      chrome.test.assertTrue(mockCallback.wasCalled);
-      chrome.test.assertEq(0, viewport.position.x);
-      chrome.test.assertEq(300, viewport.position.y);
-
-      mockCallback.reset();
-      navigatorDelegate.reset();
-      navigatingDone =
-          eventToPromise('navigate-for-testing', navigator.getEventTarget());
-      // #ABC is not a named destination in the page so viewport should not
-      // update, and the viewport position should remain same as testNavigate3's
-      // navigating results, as this link will open in the same tab.
-      navigator.navigate(url + '#ABC', WindowOpenDisposition.CURRENT_TAB);
-      await navigatingDone;
-      chrome.test.assertFalse(mockCallback.wasCalled);
-      chrome.test.assertTrue(navigatorDelegate.navigateInCurrentTabCalled);
-      chrome.test.assertEq(0, viewport.position.x);
-      chrome.test.assertEq(300, viewport.position.y);
-    });
+    mockCallback.reset();
+    let navigatingDone =
+        eventToPromise('navigate-for-testing', navigator.getEventTarget());
+    // This should move viewport to page 0.
+    navigator.navigate(url + '#US', WindowOpenDisposition.CURRENT_TAB);
+    await navigatingDone;
+    chrome.test.assertTrue(mockCallback.wasCalled);
+    chrome.test.assertEq(0, viewport.position.x);
+    chrome.test.assertEq(0, viewport.position.y);
+
+    mockCallback.reset();
+    navigatorDelegate.reset();
+    navigatingDone =
+        eventToPromise('navigate-for-testing', navigator.getEventTarget());
+    // This should open "http://xyz.pdf#US" in a new tab. So current tab
+    // viewport should not update and viewport position should remain same.
+    navigator.navigate(url + '#US', WindowOpenDisposition.NEW_BACKGROUND_TAB);
+    await navigatingDone;
+    chrome.test.assertFalse(mockCallback.wasCalled);
+    chrome.test.assertTrue(navigatorDelegate.navigateInNewTabCalled);
+    chrome.test.assertEq(0, viewport.position.x);
+    chrome.test.assertEq(0, viewport.position.y);
+
+    mockCallback.reset();
+    navigatingDone =
+        eventToPromise('navigate-for-testing', navigator.getEventTarget());
+    // This should move viewport to page 2.
+    navigator.navigate(url + '#UY', WindowOpenDisposition.CURRENT_TAB);
+    await navigatingDone;
+    chrome.test.assertTrue(mockCallback.wasCalled);
+    chrome.test.assertEq(0, viewport.position.x);
+    chrome.test.assertEq(300, viewport.position.y);
+
+    mockCallback.reset();
+    navigatorDelegate.reset();
+    navigatingDone =
+        eventToPromise('navigate-for-testing', navigator.getEventTarget());
+    // #ABC is not a named destination in the page so viewport should not
+    // update, and the viewport position should remain same as testNavigate3's
+    // navigating results, as this link will open in the same tab.
+    navigator.navigate(url + '#ABC', WindowOpenDisposition.CURRENT_TAB);
+    await navigatingDone;
+    chrome.test.assertFalse(mockCallback.wasCalled);
+    chrome.test.assertTrue(navigatorDelegate.navigateInCurrentTabCalled);
+    chrome.test.assertEq(0, viewport.position.x);
+    chrome.test.assertEq(300, viewport.position.y);
+    chrome.test.succeed();
   },
   /**
    * Test opening a url in the same tab, in a new tab, and in a new window for

chrome/test/data/pdf/test_util.js

@@ -323,16 +323,6 @@ export function getZoomableViewport(
   return viewport;
 }
 
-/** @param {Function} f */
-export async function testAsync(f) {
-  try {
-    await f();
-    chrome.test.succeed();
-  } catch (e) {
-    chrome.test.fail(e.stack);
-  }
-}
-
 /**
  * Async spin until predicate() returns true.
  * @param {function(): boolean} predicate