Reland '[Closure GN] Convert MD Bookmarks Closure Compilation to GN'

This CL relands the conversion which failed due to Windows bots trying
to run the compilation without Java. A GN flag has since been added
which fixes the issue.

Original: https://chromium-review.googlesource.com/c/chromium/src/+/954822

Bug: 632206
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: Iee3e684bd66873deaab742ad9d545a8c1b8dd8ce
Tbr: dpapad@chromium.org
Reviewed-on: https://chromium-review.googlesource.com/985712Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Reviewed-by: calamity <calamity@chromium.org>
Commit-Queue: calamity <calamity@chromium.org>
Cr-Commit-Position: refs/heads/master@{#547974}

BUILD.gn

@@ -1137,7 +1137,7 @@ template("assert_valid_out_dir") {
 if (closure_compile) {
   group("webui_closure_compile") {
     data_deps = [
-      "chrome/browser/resources/engagement:closure_compile",
+      "chrome/browser/resources:closure_compile",
       "ui/webui/resources:closure_compile",
     ]
   }

chrome/browser/resources/BUILD.gn

@@ -7,6 +7,15 @@ import("//tools/grit/grit_rule.gni")
 
 assert(!is_ios, "Chromium/iOS shouldn't use anything in //chrome")
 
+if (closure_compile) {
+  group("closure_compile") {
+    deps = [
+      "engagement:closure_compile",
+      "md_bookmarks:closure_compile",
+    ]
+  }
+}
+
 grit("invalidations_resources") {
   source = "invalidations_resources.grd"
   defines = chrome_grit_defines

chrome/browser/resources/md_bookmarks/BUILD.gn

+# Copyright 2018 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.
+
 import("../optimize_webui.gni")
+import("//third_party/closure_compiler/compile_js.gni")
 
 optimize_webui("build") {
   host = "bookmarks"
@@ -10,3 +15,239 @@ optimize_webui("build") {
 
   deps = []
 }
+
+js_type_check("closure_compile") {
+  deps = [
+    ":actions",
+    ":api_listener",
+    ":app",
+    ":command_manager",
+    ":constants",
+    ":debouncer",
+    ":dialog_focus_manager",
+    ":dnd_chip",
+    ":dnd_manager",
+    ":edit_dialog",
+    ":folder_node",
+    ":item",
+    ":list",
+    ":mouse_focus_behavior",
+    ":reducers",
+    ":router",
+    ":store",
+    ":store_client",
+    ":toast_manager",
+    ":toolbar",
+    ":types",
+    ":util",
+  ]
+}
+
+js_library("actions") {
+  deps = [
+    ":types",
+    ":util",
+    "//ui/webui/resources/js:cr",
+  ]
+  externs_list = [ "$externs_path/chrome_extensions.js" ]
+}
+
+js_library("api_listener") {
+  deps = [
+    ":actions",
+    ":debouncer",
+    ":store",
+    ":util",
+    "//ui/webui/resources/js:cr",
+  ]
+  externs_list = [ "$externs_path/chrome_extensions.js" ]
+}
+
+js_library("app") {
+  deps = [
+    ":api_listener",
+    ":dnd_manager",
+    ":mouse_focus_behavior",
+    ":router",
+    ":store",
+    ":store_client",
+    "//ui/webui/resources/js:load_time_data",
+    "//ui/webui/resources/js/cr/ui:splitter",
+  ]
+  externs_list = [ "$externs_path/chrome_extensions.js" ]
+}
+
+js_library("command_manager") {
+  deps = [
+    ":api_listener",
+    ":dialog_focus_manager",
+    ":edit_dialog",
+    ":store_client",
+    ":toast_manager",
+    "//third_party/polymer/v1_0/components-chromium/iron-a11y-keys-behavior:iron-a11y-keys-behavior-extracted",
+    "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu",
+    "//ui/webui/resources/cr_elements/cr_lazy_render:cr_lazy_render",
+    "//ui/webui/resources/js:cr",
+    "//ui/webui/resources/js:load_time_data",
+    "//ui/webui/resources/js/cr/ui:command",
+  ]
+  externs_list = [ "$externs_path/bookmark_manager_private.js" ]
+}
+
+js_library("constants") {
+}
+
+js_library("debouncer") {
+  deps = [
+    "//ui/webui/resources/js:cr",
+  ]
+}
+
+js_library("dialog_focus_manager") {
+  deps = [
+    "//ui/webui/resources/js:cr",
+  ]
+}
+
+js_library("dnd_chip") {
+  deps = [
+    ":types",
+    "//ui/webui/resources/js:cr",
+    "//ui/webui/resources/js:icon",
+  ]
+}
+
+js_library("dnd_manager") {
+  deps = [
+    ":api_listener",
+    ":debouncer",
+    ":dnd_chip",
+    ":folder_node",
+    ":store",
+    ":types",
+    ":util",
+    "//ui/webui/resources/js:cr",
+  ]
+  externs_list = [
+    "$externs_path/bookmark_manager_private.js",
+    "$externs_path/metrics_private.js",
+  ]
+}
+
+js_library("edit_dialog") {
+  deps = [
+    ":api_listener",
+    ":dialog_focus_manager",
+    ":types",
+    "//third_party/polymer/v1_0/components-chromium/paper-input:paper-input-extracted",
+    "//ui/webui/resources/js:assert",
+    "//ui/webui/resources/js:cr",
+    "//ui/webui/resources/js:load_time_data",
+  ]
+  externs_list = [ "$externs_path/chrome_extensions.js" ]
+}
+
+js_library("folder_node") {
+  deps = [
+    ":actions",
+    ":command_manager",
+    ":store_client",
+    "//ui/webui/resources/js:load_time_data",
+  ]
+  externs_list = [ "$externs_path/chrome_extensions.js" ]
+}
+
+js_library("item") {
+  deps = [
+    ":actions",
+    ":command_manager",
+    ":store_client",
+    "//ui/webui/resources/js:icon",
+  ]
+  externs_list = [ "$externs_path/chrome_extensions.js" ]
+}
+
+js_library("list") {
+  deps = [
+    ":actions",
+    ":command_manager",
+    ":item",
+    ":store_client",
+    "//third_party/polymer/v1_0/components-chromium/iron-list:iron-list-extracted",
+    "//ui/webui/resources/js:load_time_data",
+  ]
+}
+
+js_library("mouse_focus_behavior") {
+  deps = [
+    "//ui/webui/resources/js:cr",
+  ]
+}
+
+js_library("reducers") {
+  deps = [
+    ":actions",
+    ":types",
+    "//ui/webui/resources/js:cr",
+  ]
+}
+
+js_library("router") {
+  deps = [
+    ":actions",
+    ":store_client",
+  ]
+}
+
+js_library("store") {
+  deps = [
+    ":reducers",
+    ":types",
+    "//ui/webui/resources/js:cr",
+  ]
+  externs_list = [ "$externs_path/chrome_extensions.js" ]
+}
+
+js_library("store_client") {
+  deps = [
+    ":store",
+    ":types",
+    "//ui/webui/resources/js:cr",
+  ]
+}
+
+js_library("toast_manager") {
+  deps = [
+    "//third_party/polymer/v1_0/components-chromium/iron-a11y-announcer:iron-a11y-announcer-extracted",
+    "//ui/webui/resources/js:cr",
+  ]
+}
+
+js_library("toolbar") {
+  deps = [
+    ":command_manager",
+    ":edit_dialog",
+    ":store_client",
+    "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu",
+    "//ui/webui/resources/cr_elements/cr_toolbar:cr_toolbar",
+  ]
+  externs_list = [
+    "$externs_path/bookmark_manager_private.js",
+    "$externs_path/chrome_extensions.js",
+  ]
+}
+
+js_library("types") {
+  deps = [
+    ":constants",
+  ]
+  externs_list = [ "$externs_path/chrome_extensions.js" ]
+}
+
+js_library("util") {
+  deps = [
+    ":types",
+    "//ui/webui/resources/js:cr",
+  ]
+  externs_list = [ "$externs_path/chrome_extensions.js" ]
+}

chrome/browser/resources/md_bookmarks/compiled_resources2.gyp

-# Copyright 2016 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.
-{
-  'targets': [
-    {
-      'target_name': 'actions',
-      'dependencies': [
-        '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr',
-        '<(EXTERNS_GYP):chrome_extensions',
-        'util',
-        'types',
-      ],
-      'includes': ['../../../../third_party/closure_compiler/compile_js2.gypi']
-    },
-    {
-      'target_name': 'api_listener',
-      'dependencies': [
-        '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr',
-        '<(EXTERNS_GYP):chrome_extensions',
-        'actions',
-        'debouncer',
-        'store',
-        'util',
-      ],
-      'includes': ['../../../../third_party/closure_compiler/compile_js2.gypi'],
-    },
-    {
-      'target_name': 'app',
-      'dependencies': [
-        '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:load_time_data',
-        '<(DEPTH)/ui/webui/resources/js/cr/ui/compiled_resources2.gyp:splitter',
-        '<(EXTERNS_GYP):chrome_extensions',
-        'api_listener',
-        'dnd_manager',
-        'mouse_focus_behavior',
-        'router',
-        'store',
-        'store_client',
-      ],
-      'includes': ['../../../../third_party/closure_compiler/compile_js2.gypi'],
-    },
-    {
-      'target_name': 'command_manager',
-      'dependencies': [
-        '<(DEPTH)/third_party/polymer/v1_0/components-chromium/iron-a11y-keys-behavior/compiled_resources2.gyp:iron-a11y-keys-behavior-extracted',
-        '<(DEPTH)/ui/webui/resources/cr_elements/cr_action_menu/compiled_resources2.gyp:cr_action_menu',
-        '<(DEPTH)/ui/webui/resources/cr_elements/cr_lazy_render/compiled_resources2.gyp:cr_lazy_render',
-        '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr',
-        '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:load_time_data',
-        '<(DEPTH)/ui/webui/resources/js/cr/ui/compiled_resources2.gyp:command',
-        '<(EXTERNS_GYP):bookmark_manager_private',
-        'api_listener',
-        'dialog_focus_manager',
-        'edit_dialog',
-        'store_client',
-        'toast_manager'
-      ],
-      'includes': ['../../../../third_party/closure_compiler/compile_js2.gypi'],
-    },
-    {
-      'target_name': 'constants',
-      'includes': ['../../../../third_party/closure_compiler/compile_js2.gypi']
-    },
-    {
-      'target_name': 'debouncer',
-      'dependencies': [
-        '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr',
-      ],
-      'includes': ['../../../../third_party/closure_compiler/compile_js2.gypi'],
-    },
-    {
-      'target_name': 'dialog_focus_manager',
-      'dependencies': [
-        '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr',
-      ],
-      'includes': ['../../../../third_party/closure_compiler/compile_js2.gypi'],
-    },
-    {
-      'target_name': 'dnd_chip',
-      'dependencies': [
-        '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr',
-        '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:icon',
-        'types',
-      ],
-      'includes': ['../../../../third_party/closure_compiler/compile_js2.gypi'],
-    },
-    {
-      'target_name': 'dnd_manager',
-      'dependencies': [
-        '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr',
-        '<(EXTERNS_GYP):bookmark_manager_private',
-        '<(EXTERNS_GYP):metrics_private',
-        'api_listener',
-        'debouncer',
-        'dnd_chip',
-        'folder_node',
-        'store',
-        'types',
-        'util',
-      ],
-      'includes': ['../../../../third_party/closure_compiler/compile_js2.gypi']
-    },
-    {
-      'target_name': 'edit_dialog',
-      'dependencies': [
-        '<(DEPTH)/third_party/polymer/v1_0/components-chromium/paper-input/compiled_resources2.gyp:paper-input-extracted',
-        '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:assert',
-        '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr',
-        '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:load_time_data',
-        '<(EXTERNS_GYP):chrome_extensions',
-        'api_listener',
-        'dialog_focus_manager',
-        'types',
-      ],
-      'includes': ['../../../../third_party/closure_compiler/compile_js2.gypi']
-    },
-    {
-      'target_name': 'folder_node',
-      'includes': ['../../../../third_party/closure_compiler/compile_js2.gypi'],
-      'dependencies': [
-        '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:load_time_data',
-        '<(EXTERNS_GYP):chrome_extensions',
-        'actions',
-        'command_manager',
-        'store_client',
-      ],
-    },
-    {
-      'target_name': 'item',
-      'dependencies': [
-        '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:icon',
-        '<(EXTERNS_GYP):chrome_extensions',
-        'actions',
-        'command_manager',
-        'store_client',
-      ],
-      'includes': ['../../../../third_party/closure_compiler/compile_js2.gypi'],
-    },
-    {
-      'target_name': 'list',
-      'dependencies': [
-        '<(DEPTH)/third_party/polymer/v1_0/components-chromium/iron-list/compiled_resources2.gyp:iron-list-extracted',
-        '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:load_time_data',
-        'actions',
-        'command_manager',
-        'item',
-        'store_client',
-      ],
-      'includes': ['../../../../third_party/closure_compiler/compile_js2.gypi'],
-    },
-    {
-      'target_name': 'mouse_focus_behavior',
-      'dependencies': [
-        '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr',
-      ],
-      'includes': ['../../../../third_party/closure_compiler/compile_js2.gypi'],
-    },
-    {
-      'target_name': 'reducers',
-      'dependencies': [
-        '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr',
-        'actions',
-        'types',
-      ],
-      'includes': ['../../../../third_party/closure_compiler/compile_js2.gypi'],
-    },
-    {
-      'target_name': 'router',
-      'dependencies': [
-        'actions',
-        'store_client',
-      ],
-      'includes': ['../../../../third_party/closure_compiler/compile_js2.gypi'],
-    },
-    {
-      'target_name': 'store',
-      'dependencies': [
-        '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr',
-        '<(EXTERNS_GYP):chrome_extensions',
-        'reducers',
-        'types',
-      ],
-      'includes': ['../../../../third_party/closure_compiler/compile_js2.gypi']
-    },
-    {
-      'target_name': 'store_client',
-      'dependencies': [
-        '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr',
-        'store',
-        'types',
-      ],
-      'includes': ['../../../../third_party/closure_compiler/compile_js2.gypi']
-    },
-    {
-      'target_name': 'toast_manager',
-      'dependencies': [
-        '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr',
-        '<(DEPTH)/third_party/polymer/v1_0/components-chromium/iron-a11y-announcer/compiled_resources2.gyp:iron-a11y-announcer-extracted',
-      ],
-      'includes': ['../../../../third_party/closure_compiler/compile_js2.gypi'],
-    },
-    {
-      'target_name': 'toolbar',
-      'dependencies': [
-        '<(DEPTH)/ui/webui/resources/cr_elements/cr_action_menu/compiled_resources2.gyp:cr_action_menu',
-        '<(DEPTH)/ui/webui/resources/cr_elements/cr_toolbar/compiled_resources2.gyp:cr_toolbar',
-        '<(EXTERNS_GYP):bookmark_manager_private',
-        '<(EXTERNS_GYP):chrome_extensions',
-        'command_manager',
-        'edit_dialog',
-        'store_client',
-      ],
-      'includes': ['../../../../third_party/closure_compiler/compile_js2.gypi'],
-    },
-    {
-      'target_name': 'types',
-      'dependencies': [
-        '<(EXTERNS_GYP):chrome_extensions',
-        'constants',
-      ],
-      'includes': ['../../../../third_party/closure_compiler/compile_js2.gypi']
-    },
-    {
-      'target_name': 'util',
-      'dependencies': [
-        '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr',
-        '<(EXTERNS_GYP):chrome_extensions',
-        'types',
-      ],
-      'includes': ['../../../../third_party/closure_compiler/compile_js2.gypi']
-    }
-  ]
-}

third_party/closure_compiler/compiled_resources2.gyp

@@ -26,7 +26,6 @@
         '<(DEPTH)/chrome/browser/resources/cryptotoken/compiled_resources2.gyp:*',
         '<(DEPTH)/chrome/browser/resources/download_internals/compiled_resources2.gyp:*',
         '<(DEPTH)/chrome/browser/resources/extensions/compiled_resources2.gyp:*',
-        '<(DEPTH)/chrome/browser/resources/md_bookmarks/compiled_resources2.gyp:*',
         '<(DEPTH)/chrome/browser/resources/md_downloads/compiled_resources2.gyp:*',
         '<(DEPTH)/chrome/browser/resources/md_extensions/compiled_resources2.gyp:*',
         '<(DEPTH)/chrome/browser/resources/md_history/compiled_resources2.gyp:*',