1 files changed, 23 insertions, 7 deletions

diff --git a/chromium/BUILD.gn b/chromium/BUILD.gn
index 97494c0a078..16ad01eac88 100644
--- a/chromium/BUILD.gn
+++ b/chromium/BUILD.gn
@@ -23,11 +23,11 @@ import("//media/gpu/args.gni")
 import("//media/media_options.gni")
 import("//remoting/remoting_enable.gni")
 import("//third_party/openh264/openh264_args.gni")
+import("//third_party/closure_compiler/compile_js.gni")
 import("//tools/ipc_fuzzer/ipc_fuzzer.gni")
 import("//ui/base/ui_features.gni")
 import("//ui/gl/features.gni")
 import("//ui/ozone/ozone.gni")
-import("//ui/webui/webui_features.gni")
 import("//v8/gni/snapshot_toolchain.gni")
 import("//v8/gni/v8.gni")
 
@@ -79,7 +79,6 @@ group("gn_all") {
     "//services/service_manager/public/cpp",
     "//skia:skia_unittests",
     "//sql:sql_unittests",
-    "//third_party/abseil-cpp:absl_tests",
     "//third_party/flatbuffers:flatbuffers_unittests",
     "//tools/binary_size:binary_size_trybot_py",
     "//tools/ipc_fuzzer:ipc_fuzzer_all",
@@ -90,6 +89,12 @@ group("gn_all") {
     "//url:url_unittests",
   ]
 
+  if (!is_component_build) {
+    deps += [
+      "//third_party/abseil-cpp:absl_tests",
+    ]
+  }
+
   if (!is_android && !is_chromecast) {
     deps += [
       "//crypto:crypto_unittests",
@@ -97,7 +102,7 @@ group("gn_all") {
     ]
   }
 
-  if (closure_compile) {
+  if (enable_js_type_check) {
     deps += [ ":webui_closure_compile" ]
   }
 
@@ -297,7 +302,7 @@ group("gn_all") {
   }
 
   if (use_x11 || ozone_platform_x11) {
-    deps += [ "//tools/xdisplaycheck" ]
+    deps += [ "//ui/platform_window/x11:x11_unittests" ]
   }
 
   if (is_win) {
@@ -322,6 +327,13 @@ group("gn_all") {
     deps += [ "//chrome/installer/gcapi_mac:gcapi_example" ]
   }
 
+  # Allow building md5sum tool for other OSes (android is added below).
+  # For Windows, see: crbug.com/1090428.
+  # TODO(cavalcantii): move it out of 'android' folder.
+  if (!is_win) {
+    deps += [ "//tools/android/md5sum" ]
+  }
+
   if (is_android) {
     deps += [
       "//base:base_junit_tests",
@@ -349,7 +361,6 @@ group("gn_all") {
       "//tools/android:push_apps_to_background",
       "//tools/android/audio_focus_grabber:audio_focus_grabber_apk",
       "//tools/android/customtabs_benchmark:customtabs_benchmark_apk",
-      "//tools/android/errorprone_plugin:errorprone_plugin_java",
       "//tools/android/kerberos/SpnegoAuthenticator:spnego_authenticator_apk",
       "//ui/android:ui_junit_tests",
       "//weblayer/public/java:client_aar",
@@ -378,7 +389,6 @@ group("gn_all") {
         "//android_webview/test",
         "//android_webview/tools/automated_ui_tests:webview_ui_test_app",
         "//android_webview/tools/system_webview_shell",
-        "//android_webview/tools/webview_log_verbosifier:webview_log_verbosifier_apk",
         "//chrome/android:chrome_junit_tests",
         "//chrome/android:chrome_public_apk",
         "//chrome/android:chrome_public_test_apk",
@@ -1055,6 +1065,7 @@ if (!is_ios) {
       "//skia/public/mojom:mojom_js_data_deps",
       "//testing/buildbot/filters:blink_web_tests_filter",
       "//third_party/blink/public:blink_devtools_frontend_resources_files",
+      "//third_party/blink/public:blink_devtools_inspector_resources",
       "//third_party/blink/public/mojom:mojom_platform_js_data_deps",
       "//third_party/blink/renderer/core/html:js_files_for_form_controls_web_tests",
       "//third_party/catapult/third_party/typ",
@@ -1098,10 +1109,15 @@ if (!is_ios) {
       "//third_party/blink/tools/",
       "//third_party/blink/web_tests/VirtualTestSuites",
       "//third_party/blink/web_tests/external/WPT_BASE_MANIFEST_8.json",
+      "//third_party/blink/web_tests/external/wpt/common/",
       "//third_party/blink/web_tests/external/wpt/resources/",
       "//third_party/blink/web_tests/resources/",
       "//third_party/blink/web_tests/wpt_internal/",
       "//third_party/pywebsocket3/src/mod_pywebsocket/",
+      "//third_party/test_fonts/test_fonts/",
+
+      # Needed by run_web_tests.py to detect DCHECK build.
+      "$root_out_dir/args.gn",
     ]
 
     if (is_win) {
@@ -1342,7 +1358,7 @@ if (is_android) {
   }
 }
 
-if (closure_compile) {
+if (enable_js_type_check) {
   group("webui_closure_compile") {
     testonly = true
     data_deps = [