Revert "[webui][ntp] Move GN targets close to source files"

This reverts commit e2431d75.

Reason for revert: Broke a number of chrome builders with the following error:
Step _generate_buildfiles failed. Error logs are shown below:
ERROR Unresolved dependencies.
//chrome/browser/media/kaleidoscope/internal/resources/module:module(//build/toolchain/linux:clang_x64)
  needs //chrome/browser/resources/new_tab_page:module_descriptor(//build/toolchain/linux:clang_x64)

Sample failed build: ci.chromium.org/p/chrome/builders/ci/linux-chrome/14497

Original change's description:
> [webui][ntp] Move GN targets close to source files
> 
> This is more consistent with the GN targets of other WebUIs.
> 
> + Move module_wrapper.* to modules/.
> 
> Change-Id: I23be97df455e8cb0a9ed35b15b184902b3fa1a9c
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2376529
> Commit-Queue: Tibor Goldschwendt <tiborg@chromium.org>
> Reviewed-by: dpapad <dpapad@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#802008}

TBR=dpapad@chromium.org,tiborg@chromium.org

Change-Id: Idb6c8115599e74333fab357cb2d40a040e8c0c82
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2377038Reviewed-by: Tal Pressman <talp@chromium.org>
Commit-Queue: Tal Pressman <talp@chromium.org>
Cr-Commit-Position: refs/heads/master@{#802045}

chrome/browser/resources/new_tab_page/BUILD.gn

@@ -18,6 +18,9 @@ js_type_check("closure_compile") {
     ":fakebox",
     ":iframe",
     ":logo",
+    ":module_descriptor",
+    ":module_registry",
+    ":modules",
     ":one_google_bar_api",
     ":promo_browser_command_proxy",
     ":realbox",
@@ -28,9 +31,6 @@ js_type_check("closure_compile") {
     ":theme_icon",
     ":utils",
     ":voice_search_overlay",
-    "modules:module_descriptor",
-    "modules:module_registry",
-    "modules:modules",
   ]
 }
 
@@ -48,11 +48,11 @@ js_library("app") {
   deps = [
     ":background_manager",
     ":browser_proxy",
+    ":module_wrapper",
+    ":modules",
     ":most_visited",
     ":one_google_bar_api",
     ":promo_browser_command_proxy",
-    "modules:module_wrapper",
-    "modules:modules",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:event_tracker.m",
     "//ui/webui/resources/js:load_time_data.m",
@@ -221,6 +221,33 @@ js_library("background_manager") {
 js_library("one_google_bar_api") {
 }
 
+js_library("module_descriptor") {
+  sources = [ "modules/module_descriptor.js" ]
+}
+
+js_library("modules") {
+  sources = [ "modules/modules.js" ]
+  deps = [
+    ":module_registry",
+    "modules/dummy:module",
+    "modules/kaleidoscope:module",
+  ]
+}
+
+js_library("module_wrapper") {
+  deps = [
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+  ]
+}
+
+js_library("module_registry") {
+  sources = [ "modules/module_registry.js" ]
+  deps = [
+    ":module_descriptor",
+    "//ui/webui/resources/js:cr.m",
+  ]
+}
+
 html_to_js("web_components_local") {
   js_files = [
     "app.js",
@@ -241,13 +268,14 @@ html_to_js("web_components_local") {
     "theme_icon.js",
     "iframe.js",
     "voice_search_overlay.js",
+    "module_wrapper.js",
   ]
 }
 
 group("web_components") {
   public_deps = [
     ":web_components_local",
-    "modules:web_components",
+    "modules/dummy:web_components",
   ]
 }
 

chrome/browser/resources/new_tab_page/app.js

@@ -10,7 +10,7 @@ import './iframe.js';
 import './fakebox.js';
 import './realbox.js';
 import './logo.js';
-import './modules/module_wrapper.js';
+import './module_wrapper.js';
 import './modules/modules.js'; // Registers module descriptors.
 import 'chrome://resources/cr_elements/cr_button/cr_button.m.js';
 import 'chrome://resources/cr_elements/shared_style_css.m.js';

chrome/browser/resources/new_tab_page/modules/module_wrapper.js → chrome/browser/resources/new_tab_page/module_wrapper.js

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import {html, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
-import {ModuleDescriptor} from './module_descriptor.js';
+import {ModuleDescriptor} from './modules/module_descriptor.js';
 
 /** @fileoverview Element that implements the common module UI. */
 

chrome/browser/resources/new_tab_page/modules/BUILD.gn

-# Copyright 2020 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("//third_party/closure_compiler/compile_js.gni")
-import("//tools/polymer/html_to_js.gni")
-
-js_library("module_descriptor") {
-}
-
-js_library("modules") {
-  deps = [
-    ":module_registry",
-    "dummy:module",
-    "kaleidoscope:module",
-  ]
-}
-
-js_library("module_wrapper") {
-  deps = [
-    ":module_descriptor",
-    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
-  ]
-}
-
-js_library("module_registry") {
-  deps = [
-    ":module_descriptor",
-    "//ui/webui/resources/js:cr.m",
-  ]
-}
-
-html_to_js("web_components_local") {
-  js_files = [ "module_wrapper.js" ]
-}
-
-group("web_components") {
-  public_deps = [
-    ":web_components_local",
-    "dummy:web_components",
-  ]
-}

chrome/browser/resources/new_tab_page/modules/dummy/BUILD.gn

@@ -7,7 +7,7 @@ import("//tools/polymer/html_to_js.gni")
 
 js_library("module") {
   deps = [
-    "..:module_descriptor",
+    "../..:module_descriptor",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements/cr_grid",
   ]

chrome/browser/resources/new_tab_page/modules/kaleidoscope/BUILD.gn

-# Copyright 2020 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("//third_party/closure_compiler/compile_js.gni")
 
 js_library("module") {
-  deps = [ "..:module_descriptor" ]
+  deps = [ "//chrome/browser/resources/new_tab_page:module_descriptor" ]
 }

chrome/browser/resources/new_tab_page/modules/modules_resources.grdp

@@ -6,13 +6,4 @@
   <include name="IDR_NEW_TAB_PAGE_MODULES_KALEIDOSCOPE_MODULE_JS"
       file="modules/kaleidoscope/module.js"
       type="BINDATA" compress="false" />
-  <include name="IDR_NEW_TAB_PAGE_MODULES_MODULE_DESCRIPTOR_JS"
-      file="modules/module_descriptor.js" type="BINDATA" compress="false" />
-  <include name="IDR_NEW_TAB_PAGE_MODULES_MODULES_JS"
-      file="modules/modules.js" type="BINDATA" compress="false" />
-  <include name="IDR_NEW_TAB_PAGE_MODULES_MODULE_REGISTRY_JS"
-      file="modules/module_registry.js" type="BINDATA" compress="false" />
-  <include name="IDR_NEW_TAB_PAGE_MODULE_WRAPPER_JS"
-      file="${root_gen_dir}/chrome/browser/resources/new_tab_page/modules/module_wrapper.js"
-      use_base_dir="false" type="BINDATA" compress="false" />
 </grit-part>

chrome/browser/resources/new_tab_page/new_tab_page_resources.grd

@@ -69,12 +69,21 @@
       <include name="IDR_NEW_TAB_PAGE_REALBOX_MATCH_JS"
           file="${root_gen_dir}/chrome/browser/resources/new_tab_page/realbox_match.js"
           use_base_dir="false" type="BINDATA" compress="false" />
+      <include name="IDR_NEW_TAB_PAGE_MODULE_WRAPPER_JS"
+          file="${root_gen_dir}/chrome/browser/resources/new_tab_page/module_wrapper.js"
+          use_base_dir="false" type="BINDATA" compress="false" />
       <include name="IDR_NEW_TAB_PAGE_BROWSER_PROXY_JS"
           file="browser_proxy.js" type="BINDATA" compress="false" />
       <include name="IDR_NEW_TAB_PAGE_UTILS_JS"
           file="utils.js" type="BINDATA" compress="false" />
       <include name="IDR_NEW_TAB_PAGE_BACKGROUND_MANAGER_JS"
           file="background_manager.js" type="BINDATA" compress="false" />
+      <include name="IDR_NEW_TAB_PAGE_MODULES_MODULE_DESCRIPTOR_JS"
+          file="modules/module_descriptor.js" type="BINDATA" compress="false" />
+      <include name="IDR_NEW_TAB_PAGE_MODULES_MODULES_JS"
+          file="modules/modules.js" type="BINDATA" compress="false" />
+      <include name="IDR_NEW_TAB_PAGE_MODULES_MODULE_REGISTRY_JS"
+          file="modules/module_registry.js" type="BINDATA" compress="false" />
       <part file="new_tab_page_resources_common.grdp" />
       <part file="modules/modules_resources.grdp" />
     </includes>

chrome/test/data/webui/new_tab_page/modules/module_wrapper_test.js → chrome/test/data/webui/new_tab_page/module_wrapper_test.js

@@ -4,7 +4,7 @@
 
 import {$$} from 'chrome://new-tab-page/new_tab_page.js';
 
-suite('NewTabPageModulesModuleWrapperTest', () => {
+suite('NewTabPageModuleWrapperTest', () => {
   /** @type {!ModuleWrapperElement} */
   let moduleWrapper;
 

chrome/test/data/webui/new_tab_page/new_tab_page_browsertest.js

@@ -192,14 +192,14 @@ TEST_F('NewTabPageBackgroundManagerTest', 'All', function() {
 });
 
 // eslint-disable-next-line no-var
-var NewTabPageModulesModuleWrapperTest = class extends NewTabPageBrowserTest {
+var NewTabPageModuleWrapperTest = class extends NewTabPageBrowserTest {
   /** @override */
   get browsePreload() {
-    return 'chrome://new-tab-page/test_loader.html?module=new_tab_page/modules/module_wrapper_test.js';
+    return 'chrome://new-tab-page/test_loader.html?module=new_tab_page/module_wrapper_test.js';
   }
 };
 
-TEST_F('NewTabPageModulesModuleWrapperTest', 'All', function() {
+TEST_F('NewTabPageModuleWrapperTest', 'All', function() {
   mocha.run();
 });