Gallery: Closure compile gallery_util_unittest.js

The file itself already compiles, but when we audit the dependency tree,
we find a bunch of hidden dependencies between externs files.

To fix, move these externs to the volume_manager_wrapper target and
update all modules already depending on the wrapper already to get these
externs via that target instead of repeating them redundantly.

Some modules depend on (e.g.) the volume_info.js extern but don't
already have a dependency on volume_manager_wrapper. This CL doesn't
add one for those, but they may need updating later.

Bug: 867700
Change-Id: I4e4e5b3c9fb6f59af5f06fa945c34c58832f8fe4
Reviewed-on: https://chromium-review.googlesource.com/1171970Reviewed-by: Noel Gordon <noel@chromium.org>
Commit-Queue: Trent Apted <tapted@chromium.org>
Cr-Commit-Position: refs/heads/master@{#582494}

chrome/browser/chromeos/file_manager/gallery_jstest.cc

@@ -35,7 +35,7 @@ IN_PROC_BROWSER_TEST_F(GalleryJsTest, EntryListWatcherTest) {
 }
 
 IN_PROC_BROWSER_TEST_F(GalleryJsTest, GalleryUtilTest) {
-  RunTest(base::FilePath(FILE_PATH_LITERAL("gallery_util_unittest.html")));
+  RunGeneratedTest("/gallery_util_unittest.html");
 }
 
 IN_PROC_BROWSER_TEST_F(GalleryJsTest, GalleryItemTest) {

ui/file_manager/audio_player/js/BUILD.gn

@@ -19,15 +19,10 @@ js_library("closure_compile_externs") {
   externs_list = [
     "$externs_path/chrome_extensions.js",
     "$externs_path/command_line_private.js",
-    "$externs_path/file_manager_private.js",
-    "$externs_path/file_system_provider.js",
     "$externs_path/metrics_private.js",
     "../../externs/audio_player_foreground.js",
     "../../externs/entry_location.js",
     "../../externs/platform.js",
-    "../../externs/volume_info.js",
-    "../../externs/volume_info_list.js",
-    "../../externs/volume_manager.js",
     "//third_party/analytics/externs.js",
   ]
 }

ui/file_manager/file_manager/foreground/js/BUILD.gn

@@ -67,8 +67,6 @@ js_library("closure_compile_externs") {
   sources = []
   externs_list = [
     "$externs_path/command_line_private.js",
-    "$externs_path/file_manager_private.js",
-    "$externs_path/file_system_provider.js",
     "$externs_path/metrics_private.js",
     "$externs_path/web_animations.js",
     "../../../externs/app_window_common.js",
@@ -611,7 +609,13 @@ js_library("volume_manager_wrapper") {
     "//ui/webui/resources/js/cr/ui:array_data_model",
   ]
   externs_list = [
+    # Note: volume_info has a dependency on chrome.fileManagerPrivate.IconSet.
+    # Also, fileManagerPrivate depends on chrome.fileSystemProvider, so these
+    # must be introduced together.
+    "$externs_path/file_manager_private.js",
+    "$externs_path/file_system_provider.js",
     "../../../externs/background/volume_manager_factory.js",
+    "../../../externs/volume_info.js",
     "../../../externs/volume_info_list.js",
     "../../../externs/volume_manager.js",
   ]

ui/file_manager/file_manager/foreground/js/ui/BUILD.gn

@@ -45,8 +45,6 @@ js_library("closure_compile_externs") {
   sources = []
   externs_list = [
     "$externs_path/command_line_private.js",
-    "$externs_path/file_manager_private.js",
-    "$externs_path/file_system_provider.js",
     "$externs_path/metrics_private.js",
     "$externs_path/web_animations.js",
     "../../../../externs/app_window_common.js",
@@ -55,7 +53,6 @@ js_library("closure_compile_externs") {
     "../../../../externs/background/file_operation_manager.js",
     "../../../../externs/background/import_history.js",
     "../../../../externs/background/import_history_enum.js",
-    "../../../../externs/background/volume_manager_factory.js",
     "../../../../externs/background_window.js",
     "../../../../externs/chrome_echo_private.js",
     "../../../../externs/chrome_webstore_widget_private.js",
@@ -68,9 +65,6 @@ js_library("closure_compile_externs") {
     "../../../../externs/paper_elements.js",
     "../../../../externs/platform.js",
     "../../../../externs/search_item.js",
-    "../../../../externs/volume_info.js",
-    "../../../../externs/volume_info_list.js",
-    "../../../../externs/volume_manager.js",
     "//third_party/analytics/externs.js",
   ]
 }

ui/file_manager/gallery/js/BUILD.gn

@@ -102,7 +102,15 @@ js_library("gallery_util") {
     "../../file_manager/common/js:volume_manager_common",
     "../../file_manager/foreground/js:volume_manager_wrapper",
   ]
-  externs_list = [ "../../externs/volume_info.js" ]
+}
+
+js_library("gallery_util_unittest") {
+  deps = [
+    ":gallery_util",
+    "../../file_manager/common/js:mock_entry",
+    "../../file_manager/common/js:unittest_util",
+    "//ui/webui/resources/js:webui_resource_test",
+  ]
 }
 
 js_library("metadata_worker") {
@@ -162,6 +170,7 @@ js_library("thumbnail_mode") {
 
 js_unit_tests("unit_tests") {
   deps = [
+    ":gallery_util_unittest",
     ":ribbon_unittest",
   ]
 }

ui/file_manager/gallery/js/gallery_util_unittest.html

-<!DOCTYPE html>
-<!-- Copyright 2014 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.
-  -->
-
-<script src="../../file_manager/common/js/file_type.js"></script>
-<script src="../../file_manager/common/js/mock_entry.js"></script>
-<script src="../../file_manager/common/js/util.js"></script>
-<script src="../../file_manager/common/js/unittest_util.js"></script>
-<script src="gallery_util.js"></script>
-
-<script src="gallery_util_unittest.js"></script>

ui/file_manager/video_player/js/BUILD.gn

@@ -20,16 +20,11 @@ js_library("closure_compile_externs") {
   externs_list = [
     "$externs_path/chrome_extensions.js",
     "$externs_path/command_line_private.js",
-    "$externs_path/file_manager_private.js",
-    "$externs_path/file_system_provider.js",
     "$externs_path/media_player_private.js",
     "$externs_path/metrics_private.js",
     "../../externs/chrome_cast.js",
     "../../externs/entry_location.js",
     "../../externs/platform.js",
-    "../../externs/volume_info.js",
-    "../../externs/volume_info_list.js",
-    "../../externs/volume_manager.js",
     "//third_party/analytics/externs.js",
   ]
 }