PDF Viewer: Export all test dependencies from the same file.

Preparation for bundling the PDF Viewer's resources, step 2/3.

 - Add a pdf_viewer_wrapper.js top-level file, necessary to make tests
   work in both optimized_webui true/false modes
 - Update all PDF Viewer tests to import dependencies from the new
   file
 - Minor tweaks to keep Print Preview working, while using the same
   c/b/r/pdf/main.js file

Bug: 1163956
Change-Id: I92dde642f94edbcf08ff72c9cdb5c11bd9f7e8a8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2625334
Auto-Submit: dpapad <dpapad@chromium.org>
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#843134}

chrome/browser/resources/pdf/BUILD.gn

@@ -37,6 +37,7 @@ preprocess_if_expr("preprocess") {
     "pdf_scripting_api.js",
     "pdf_viewer_base.js",
     "pdf_viewer_utils.js",
+    "pdf_viewer_wrapper.js",
     "toolbar_manager.js",
     "viewport.js",
     "viewport_scroller.js",
@@ -297,6 +298,10 @@ js_library("pdf_viewer") {
   externs_list = [ "$externs_path/resources_private.js" ]
 }
 
+js_library("pdf_viewer_wrapper") {
+  deps = [ ":pdf_viewer" ]
+}
+
 js_library("pdf_viewer_utils") {
   deps = [
     ":controller",
@@ -352,6 +357,7 @@ js_type_check("closure_compile_local") {
     ":pdf_viewer_base",
     ":pdf_viewer_pp",
     ":pdf_viewer_utils",
+    ":pdf_viewer_wrapper",
     ":toolbar_manager",
     ":viewport",
     ":viewport_scroller",

chrome/browser/resources/pdf/index.html

@@ -22,5 +22,5 @@
 <pdf-viewer id="viewer"></pdf-viewer>
 </body>
 <script type="module" src="main.js"></script>
-<script type="module" src="pdf_viewer.js"></script>
+<script type="module" src="pdf_viewer_wrapper.js"></script>
 </html>

chrome/browser/resources/pdf/index_pp.html

@@ -18,8 +18,5 @@
 <pdf-viewer-pp id="viewer"></pdf-viewer-pp>
 </body>
 <script type="module" src="main.js"></script>
-<!-- The line below refers to pdf_viewer_pp.js, which is served under the path
-     pdf_viewer.js so that the PDF viewer and Print Preview viewer can use the
-     same main.js source. main.js imports pdf_viewer.js. -->
-<script type="module" src="pdf_viewer.js"></script>
+<script type="module" src="pdf_viewer_wrapper.js"></script>
 </html>

chrome/browser/resources/pdf/main.js

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import './pdf_viewer.js';
+import './pdf_viewer_wrapper.js';
 
 import {BrowserApi, createBrowserApi} from './browser_api.js';
 

chrome/browser/resources/pdf/pdf_viewer_wrapper.js

+// Copyright 2021 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.
+
+export {BrowserApi, ZoomBehavior} from './browser_api.js';
+export {FittingType, SaveRequestType} from './constants.js';
+export {PluginController} from './controller.js';
+export {ViewerDocumentOutlineElement} from './elements/viewer-document-outline.js';
+export {ViewerDownloadControlsElement} from './elements/viewer-download-controls.js';
+export {ViewerPdfSidenavElement} from './elements/viewer-pdf-sidenav.js';
+export {ViewerPdfToolbarNewElement} from './elements/viewer-pdf-toolbar-new.js';
+export {ViewerPropertiesDialogElement} from './elements/viewer-properties-dialog.js';
+export {ViewerThumbnailBarElement} from './elements/viewer-thumbnail-bar.js';
+export {PAINTED_ATTRIBUTE, ViewerThumbnailElement} from './elements/viewer-thumbnail.js';
+export {GestureDetector, PinchEventDetail} from './gesture_detector.js';
+export {PDFMetrics, UserAction} from './metrics.js';
+export {NavigatorDelegate, PdfNavigator, WindowOpenDisposition} from './navigator.js';
+export {OpenPdfParamsParser} from './open_pdf_params_parser.js';
+export {PDFScriptingAPI} from './pdf_scripting_api.js';
+export {getFilenameFromURL, PDFViewerElement} from './pdf_viewer.js';
+export {shouldIgnoreKeyEvents} from './pdf_viewer_utils.js';
+export {ToolbarManager} from './toolbar_manager.js';
+export {LayoutOptions, PAGE_SHADOW, Viewport} from './viewport.js';
+export {ZoomManager} from './zoom_manager.js';

chrome/browser/resources/print_preview/BUILD.gn

@@ -54,7 +54,10 @@ generate_grd("build_grd") {
   ]
   resource_path_rewrites = [
     "pdf/index_pp.html|pdf/index.html",
-    "pdf/pdf_viewer_pp.js|pdf/pdf_viewer.js",
+
+    # Expose pdf_viewer_pp.js as pdf_viewer_wrapper.js so that the PDF viewer
+    # and Print Preview viewer can use the same main.js source.
+    "pdf/pdf_viewer_pp.js|pdf/pdf_viewer_wrapper.js",
   ]
   if (optimize_webui) {
     deps += [ ":build" ]

chrome/test/data/pdf/BUILD.gn

@@ -50,37 +50,27 @@ js_type_check("closure_compile") {
 }
 
 js_library("basic_plugin_test") {
-  deps = [
-    "//chrome/browser/resources/pdf:pdf_scripting_api",
-    "//chrome/browser/resources/pdf:pdf_viewer",
-  ]
+  deps = [ "//chrome/browser/resources/pdf:pdf_viewer_wrapper" ]
   externs_list = [ "$externs_path/test.js" ]
 }
 
 js_library("basic_test") {
   deps = [
-    "//chrome/browser/resources/pdf:pdf_viewer",
-    "//chrome/browser/resources/pdf:pdf_viewer_utils",
-    "//chrome/browser/resources/pdf/elements:viewer-pdf-toolbar",
-    "//chrome/browser/resources/pdf/elements:viewer-toolbar-dropdown",
+    "//chrome/browser/resources/pdf:pdf_viewer_wrapper",
     "//third_party/polymer/v3_0/components-chromium/iron-test-helpers:mock-interactions",
   ]
   externs_list = [ "$externs_path/test.js" ]
 }
 
 js_library("beep_test") {
-  deps = [
-    "//chrome/browser/resources/pdf:pdf_scripting_api",
-    "//chrome/browser/resources/pdf:pdf_viewer",
-  ]
+  deps = [ "//chrome/browser/resources/pdf:pdf_viewer_wrapper" ]
   externs_list = [ "$externs_path/test.js" ]
 }
 
 js_library("bookmarks_test") {
   deps = [
     ":test_util",
-    "//chrome/browser/resources/pdf:pdf_scripting_api",
-    "//chrome/browser/resources/pdf:pdf_viewer",
+    "//chrome/browser/resources/pdf:pdf_viewer_wrapper",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
   ]
   externs_list = [ "$externs_path/test.js" ]
@@ -96,21 +86,14 @@ js_library("gesture_detector_test") {
 }
 
 js_library("layout_test") {
-  deps = [
-    "//chrome/browser/resources/pdf:pdf_scripting_api",
-    "//chrome/browser/resources/pdf:pdf_viewer",
-  ]
+  deps = [ "//chrome/browser/resources/pdf:pdf_viewer_wrapper" ]
   externs_list = [ "$externs_path/test.js" ]
 }
 
 js_library("material_elements_test") {
   deps = [
     ":test_util",
-    "//chrome/browser/resources/pdf:constants",
-    "//chrome/browser/resources/pdf/elements:viewer-page-selector",
-    "//chrome/browser/resources/pdf/elements:viewer-toolbar-dropdown",
-    "//chrome/browser/resources/pdf/elements:viewer-zoom-button",
-    "//chrome/browser/resources/pdf/elements:viewer-zoom-toolbar",
+    "//chrome/browser/resources/pdf:pdf_viewer_wrapper",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements/cr_icon_button:cr_icon_button.m",
   ]
@@ -119,8 +102,7 @@ js_library("material_elements_test") {
 
 js_library("download_controls_test") {
   deps = [
-    "//chrome/browser/resources/pdf:constants",
-    "//chrome/browser/resources/pdf/elements:viewer-download-controls",
+    "//chrome/browser/resources/pdf:pdf_viewer_wrapper",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu.m",
     "//ui/webui/resources/cr_elements/cr_icon_button:cr_icon_button.m",
@@ -133,9 +115,7 @@ js_library("fullscreen_test") {
   deps = [
     ":test_util",
     "../webui:test_util.m",
-    "//chrome/browser/resources/pdf:constants",
-    "//chrome/browser/resources/pdf:pdf_scripting_api",
-    "//chrome/browser/resources/pdf:pdf_viewer",
+    "//chrome/browser/resources/pdf:pdf_viewer_wrapper",
     "//third_party/polymer/v3_0/components-chromium/iron-test-helpers:mock-interactions",
     "//ui/webui/resources/js:cr.m",
     "//ui/webui/resources/js:util.m",
@@ -147,45 +127,37 @@ js_library("navigator_test") {
   deps = [
     ":test_util",
     "../webui:test_browser_proxy.m",
-    "//chrome/browser/resources/pdf:navigator",
-    "//chrome/browser/resources/pdf:open_pdf_params_parser",
-    "//chrome/browser/resources/pdf:pdf_scripting_api",
+    "//chrome/browser/resources/pdf:pdf_viewer_wrapper",
   ]
   externs_list = [ "$externs_path/test.js" ]
 }
 
 js_library("nobeep_test") {
-  deps = [
-    "//chrome/browser/resources/pdf:pdf_scripting_api",
-    "//chrome/browser/resources/pdf:pdf_viewer",
-  ]
+  deps = [ "//chrome/browser/resources/pdf:pdf_viewer_wrapper" ]
   externs_list = [ "$externs_path/test.js" ]
 }
 
 js_library("page_change_test") {
   deps = [
-    "//chrome/browser/resources/pdf:pdf_viewer",
+    "//chrome/browser/resources/pdf:pdf_viewer_wrapper",
     "//third_party/polymer/v3_0/components-chromium/iron-test-helpers:mock-interactions",
   ]
   externs_list = [ "$externs_path/test.js" ]
 }
 
 js_library("printing_icon_test") {
-  deps = [ "//chrome/browser/resources/pdf:pdf_viewer" ]
+  deps = [ "//chrome/browser/resources/pdf:pdf_viewer_wrapper" ]
   externs_list = [ "$externs_path/test.js" ]
 }
 
 js_library("params_parser_test") {
-  deps = [
-    "//chrome/browser/resources/pdf:open_pdf_params_parser",
-    "//chrome/browser/resources/pdf:pdf_scripting_api",
-  ]
+  deps = [ "//chrome/browser/resources/pdf:pdf_viewer_wrapper" ]
   externs_list = [ "$externs_path/test.js" ]
 }
 
 js_library("test_util") {
   deps = [
-    "//chrome/browser/resources/pdf:viewport",
+    "//chrome/browser/resources/pdf:pdf_viewer_wrapper",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
   ]
 }
@@ -195,15 +167,14 @@ js_library("title_test") {
 }
 
 js_library("viewer_pdf_sidenav_test") {
-  deps = [ "//chrome/browser/resources/pdf/elements:viewer-pdf-sidenav" ]
+  deps = [ "//chrome/browser/resources/pdf:pdf_viewer_wrapper" ]
   externs_list = [ "$externs_path/test.js" ]
 }
 
 js_library("viewer_pdf_toolbar_new_test") {
   deps = [
     "../webui:test_util.m",
-    "//chrome/browser/resources/pdf:constants",
-    "//chrome/browser/resources/pdf/elements:viewer-pdf-toolbar-new",
+    "//chrome/browser/resources/pdf:pdf_viewer_wrapper",
   ]
   externs_list = [ "$externs_path/test.js" ]
 }
@@ -211,8 +182,7 @@ js_library("viewer_pdf_toolbar_new_test") {
 js_library("viewer_properties_dialog_test") {
   deps = [
     "../webui:test_util.m",
-    "//chrome/browser/resources/pdf:pdf_viewer",
-    "//chrome/browser/resources/pdf/elements:viewer-properties-dialog",
+    "//chrome/browser/resources/pdf:pdf_viewer_wrapper",
   ]
   externs_list = [ "$externs_path/test.js" ]
 }
@@ -220,9 +190,7 @@ js_library("viewer_properties_dialog_test") {
 js_library("viewer_thumbnail_bar_test") {
   deps = [
     "../webui:test_util.m",
-    "//chrome/browser/resources/pdf:controller",
-    "//chrome/browser/resources/pdf/elements:viewer-thumbnail",
-    "//chrome/browser/resources/pdf/elements:viewer-thumbnail-bar",
+    "//chrome/browser/resources/pdf:pdf_viewer_wrapper",
     "//third_party/polymer/v3_0/components-chromium/iron-test-helpers:mock-interactions",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js/cr/ui:focus_outline_manager.m",
@@ -232,7 +200,7 @@ js_library("viewer_thumbnail_bar_test") {
 
 js_library("viewer_thumbnail_test") {
   deps = [
-    "//chrome/browser/resources/pdf/elements:viewer-thumbnail",
+    "//chrome/browser/resources/pdf:pdf_viewer_wrapper",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
   ]
   externs_list = [ "$externs_path/test.js" ]
@@ -241,8 +209,7 @@ js_library("viewer_thumbnail_test") {
 js_library("viewport_test") {
   deps = [
     ":test_util",
-    "//chrome/browser/resources/pdf:constants",
-    "//chrome/browser/resources/pdf:viewport",
+    "//chrome/browser/resources/pdf:pdf_viewer_wrapper",
   ]
   externs_list = [ "$externs_path/test.js" ]
 }

chrome/test/data/pdf/annotations_toolbar_test.js

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 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 {ViewerPdfToolbarNewElement} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer_wrapper.js';
 
 /** @return {!ViewerPdfToolbarNewElement} */
 function createToolbar() {

chrome/test/data/pdf/basic_plugin_test.js

@@ -2,8 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {PDFScriptingAPI} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_scripting_api.js';
-import {PDFViewerElement} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer.js';
+import {PDFScriptingAPI, PDFViewerElement} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer_wrapper.js';
 
 /**
  * These tests require that the PDF plugin be available to run correctly.

chrome/test/data/pdf/basic_test.js

@@ -2,8 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {getFilenameFromURL, PDFViewerElement} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer.js';
-import {shouldIgnoreKeyEvents} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer_utils.js';
+import {getFilenameFromURL, PDFViewerElement, shouldIgnoreKeyEvents} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer_wrapper.js';
 import {pressAndReleaseKeyOn} from 'chrome://resources/polymer/v3_0/iron-test-helpers/mock-interactions.js';
 
 const tests = [

chrome/test/data/pdf/beep_test.js

@@ -2,8 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {PDFScriptingAPI} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_scripting_api.js';
-import {PDFViewerElement} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer.js';
+import {PDFScriptingAPI, PDFViewerElement} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer_wrapper.js';
 
 const tests = [
   /**

chrome/test/data/pdf/bookmarks_test.js

@@ -2,8 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {PDFScriptingAPI} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_scripting_api.js';
-import {PDFViewerElement} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer.js';
+import {PDFScriptingAPI, PDFViewerElement} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer_wrapper.js';
 import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 import {createBookmarksForTest} from './test_util.js';

chrome/test/data/pdf/download_controls_test.js

@@ -2,8 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {SaveRequestType} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/constants.js';
-import {ViewerDownloadControlsElement} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/elements/viewer-download-controls.js';
+import {SaveRequestType, ViewerDownloadControlsElement} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer_wrapper.js';
 import {listenOnce} from 'chrome://resources/js/util.m.js';
 import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 

chrome/test/data/pdf/fullscreen_test.js

@@ -3,9 +3,7 @@
 // found in the LICENSE file.
 
 import {eventToPromise} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/_test_resources/webui/test_util.m.js';
-import {FittingType} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/constants.js';
-import {PDFScriptingAPI} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_scripting_api.js';
-import {PDFViewerElement} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer.js';
+import {FittingType, PDFScriptingAPI, PDFViewerElement} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer_wrapper.js';
 import {isMac} from 'chrome://resources/js/cr.m.js';
 import {getDeepActiveElement} from 'chrome://resources/js/util.m.js';
 import {keyDownOn} from 'chrome://resources/polymer/v3_0/iron-test-helpers/mock-interactions.js';

chrome/test/data/pdf/gesture_detector_test.js

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {GestureDetector, PinchEventDetail} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/gesture_detector.js';
+import {GestureDetector, PinchEventDetail} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer_wrapper.js';
 import {NativeEventTarget as EventTarget} from 'chrome://resources/js/cr/event_target.m.js';
 import {createWheelEvent} from './test_util.js';
 

chrome/test/data/pdf/layout_test.js

@@ -2,8 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {PDFScriptingAPI} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_scripting_api.js';
-import {PDFViewerElement} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer.js';
+import {PDFScriptingAPI, PDFViewerElement} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer_wrapper.js';
 
 // Tests common to all PDFs.
 const tests = [

chrome/test/data/pdf/material_elements_test.js

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {FittingType} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/constants.js';
+import {FittingType} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer_wrapper.js';
 import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 import {createBookmarksForTest} from './test_util.js';

chrome/test/data/pdf/metrics_test.js

@@ -2,8 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {FittingType} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/constants.js';
-import {PDFMetrics, UserAction} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/metrics.js';
+import {FittingType, PDFMetrics, UserAction} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer_wrapper.js';
 
 chrome.test.runTests(function() {
   'use strict';

chrome/test/data/pdf/navigator_test.js

@@ -3,9 +3,7 @@
 // found in the LICENSE file.
 
 import {TestBrowserProxy} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/_test_resources/webui/test_browser_proxy.m.js';
-import {NavigatorDelegate, PdfNavigator, WindowOpenDisposition} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/navigator.js';
-import {OpenPdfParamsParser} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/open_pdf_params_parser.js';
-import {PDFScriptingAPI} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_scripting_api.js';
+import {NavigatorDelegate, OpenPdfParamsParser, PdfNavigator, PDFScriptingAPI, WindowOpenDisposition} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer_wrapper.js';
 
 import {getZoomableViewport, MockDocumentDimensions, MockElement, MockSizer, MockViewportChangedCallback} from './test_util.js';
 

chrome/test/data/pdf/nobeep_test.js

@@ -2,8 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {PDFScriptingAPI} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_scripting_api.js';
-import {PDFViewerElement} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer.js';
+import {PDFScriptingAPI, PDFViewerElement} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer_wrapper.js';
 
 const tests = [
   /**

chrome/test/data/pdf/page_change_test.js

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {PDFViewerElement} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer.js';
+import {PDFViewerElement} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer_wrapper.js';
 import {pressAndReleaseKeyOn} from 'chrome://resources/polymer/v3_0/iron-test-helpers/mock-interactions.js';
 
 /** @return {!PDFViewerElement} */

chrome/test/data/pdf/params_parser_test.js

@@ -2,9 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {FittingType} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/constants.js';
-import {OpenPdfParamsParser} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/open_pdf_params_parser.js';
-import {PDFScriptingAPI} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_scripting_api.js';
+import {FittingType, OpenPdfParamsParser, PDFScriptingAPI} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer_wrapper.js';
 
 
 const tests = [

chrome/test/data/pdf/printing_icon_test.js

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {PDFViewerElement} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer.js';
+import {PDFViewerElement} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer_wrapper.js';
 
 chrome.test.runTests([
   function testPrintingEnabled() {

chrome/test/data/pdf/redirects_fail_test.js

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {PDFScriptingAPI} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_scripting_api.js';
+import {PDFScriptingAPI} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer_wrapper.js';
 
 // Load a plugin with the given paramaters.
 function createPluginForUrl(streamUrl, url, headers, progressCallback) {

chrome/test/data/pdf/test_util.js

@@ -4,7 +4,7 @@
 
 // Utilities that are used in multiple tests.
 
-import {LayoutOptions, Viewport} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/viewport.js';
+import {LayoutOptions, Viewport} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer_wrapper.js';
 import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 export class MockWindow {

chrome/test/data/pdf/title_test.js

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {PDFScriptingAPI} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_scripting_api.js';
+import {PDFScriptingAPI} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer_wrapper.js';
 
 const tests = [
   /**

chrome/test/data/pdf/toolbar_manager_test.js

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {ToolbarManager} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/toolbar_manager.js';
+import {ToolbarManager} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer_wrapper.js';
 
 import {MockWindow} from './test_util.js';
 

chrome/test/data/pdf/touch_handling_test.js

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {PDFScriptingAPI} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_scripting_api.js';
+import {PDFScriptingAPI} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer_wrapper.js';
 
 function sendTouchStart(touches) {
   let id = 0;

chrome/test/data/pdf/viewer_pdf_sidenav_test.js

@@ -2,9 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {ViewerDocumentOutlineElement} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/elements/viewer-document-outline.js';
-import {ViewerPdfSidenavElement} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/elements/viewer-pdf-sidenav.js';
-import {ViewerThumbnailBarElement} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/elements/viewer-thumbnail-bar.js';
+import {ViewerDocumentOutlineElement, ViewerPdfSidenavElement, ViewerThumbnailBarElement} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer_wrapper.js';
 
 /** @return {!ViewerPdfSidenavElement} */
 function createSidenav() {

chrome/test/data/pdf/viewer_pdf_toolbar_new_test.js

@@ -3,8 +3,7 @@
 // found in the LICENSE file.
 
 import {eventToPromise, flushTasks} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/_test_resources/webui/test_util.m.js';
-import {FittingType} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/constants.js';
-import {ViewerPdfToolbarNewElement} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/elements/viewer-pdf-toolbar-new.js';
+import {FittingType, ViewerPdfToolbarNewElement} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer_wrapper.js';
 
 /** @return {!ViewerPdfToolbarNewElement} */
 function createToolbar() {

chrome/test/data/pdf/viewer_properties_dialog_test.js

@@ -3,8 +3,7 @@
 // found in the LICENSE file.
 
 import {eventToPromise} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/_test_resources/webui/test_util.m.js';
-import {ViewerPropertiesDialogElement} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/elements/viewer-properties-dialog.js';
-import {PDFViewerElement} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer.js';
+import {PDFViewerElement, ViewerPropertiesDialogElement} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer_wrapper.js';
 
 const viewer = /** @type {!PDFViewerElement} */ (
     document.body.querySelector('pdf-viewer'));

chrome/test/data/pdf/viewer_thumbnail_bar_test.js

@@ -3,9 +3,7 @@
 // found in the LICENSE file.
 
 import {eventToPromise, waitAfterNextRender, whenAttributeIs} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/_test_resources/webui/test_util.m.js';
-import {PluginController} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/controller.js';
-import {ViewerThumbnailBarElement} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/elements/viewer-thumbnail-bar.js';
-import {PAINTED_ATTRIBUTE, ViewerThumbnailElement} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/elements/viewer-thumbnail.js';
+import {PAINTED_ATTRIBUTE, PluginController, ViewerThumbnailBarElement, ViewerThumbnailElement} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer_wrapper.js';
 import {FocusOutlineManager} from 'chrome://resources/js/cr/ui/focus_outline_manager.m.js';
 import {keyDownOn} from 'chrome://resources/polymer/v3_0/iron-test-helpers/mock-interactions.js';
 import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';

chrome/test/data/pdf/viewer_thumbnail_test.js

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {ViewerThumbnailElement} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/elements/viewer-thumbnail.js';
+import {ViewerThumbnailElement} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer_wrapper.js';
 
 /** @return {!ViewerThumbnailElement} */
 function createThumbnail() {

chrome/test/data/pdf/viewport_test.js

@@ -2,8 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {FittingType} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/constants.js';
-import {PAGE_SHADOW, Viewport} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/viewport.js';
+import {FittingType, PAGE_SHADOW, Viewport} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer_wrapper.js';
 
 import {getZoomableViewport, MockDocumentDimensions, MockElement, MockSizer, MockViewportChangedCallback} from './test_util.js';
 

chrome/test/data/pdf/whitespace_title_test.js

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {PDFScriptingAPI} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_scripting_api.js';
+import {PDFScriptingAPI} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer_wrapper.js';
 
 const tests = [
   /**

chrome/test/data/pdf/zoom_manager_test.js

@@ -2,8 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {BrowserApi, ZoomBehavior} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/browser_api.js';
-import {ZoomManager} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/zoom_manager.js';
+import {BrowserApi, ZoomBehavior, ZoomManager} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer_wrapper.js';
 import {EventTracker} from 'chrome://resources/js/event_tracker.m.js';
 
 chrome.test.runTests(function() {