Reland: Disable new JS test for ASAN properly

JS tests don't work on ASAN, which is a known bug:
https://crbug.com/1010561

Use the existing "include_js_tests" flag to exclude
password_change_authenticator_test as it is intended,
instead of an ad-hoc solution.

Reland: Last time I moved the wrong target into
the include_js_tests block, so it didn't work.

Bug: 1022385
Change-Id: I9eac120f3abef3c7b6856804f3894d2a2742f92d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1910220Reviewed-by: A Olsen <olsen@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Roman Sorokin [CET] <rsorokin@chromium.org>
Commit-Queue: A Olsen <olsen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#714872}

chrome/browser/resources/BUILD.gn

@@ -413,34 +413,27 @@ repack("dev_ui_paks") {
   ]
 }
 
-# TODO(https://crbug.com/930109): Figure out why this test fails on MAC ASAN.
-if (!is_asan || !is_mac) {
-  js2gtest("resources_unitjs_tests") {
-    test_type = "webui"
-    sources = [
-      "gaia_auth_host/password_change_authenticator_test.unitjs",
-    ]
+js2gtest("resources_unitjs_tests") {
+  test_type = "webui"
+  sources = [
+    "gaia_auth_host/password_change_authenticator_test.unitjs",
+  ]
 
-    # This has to be a gen_include, so it doesn't collide with other js2gtests
-    gen_include_files = [ "//ui/webui/resources/js/cr.js" ]
+  # This has to be a gen_include, so it doesn't collide with other js2gtests
+  gen_include_files = [ "//ui/webui/resources/js/cr.js" ]
 
-    # But these have to be extra_js_files, since it uses a native object
-    # EventTarget, which doesn't work at compile time.
-    extra_js_files = [
-      "//ui/webui/resources/js/cr/event_target.js",
-      "gaia_auth_host/password_change_authenticator.js",
-    ]
-    defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
-  }
+  # But these have to be extra_js_files, since it uses a native object
+  # EventTarget, which doesn't work at compile time.
+  extra_js_files = [
+    "//ui/webui/resources/js/cr/event_target.js",
+    "gaia_auth_host/password_change_authenticator.js",
+  ]
+  defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
+}
 
-  source_set("browser_tests") {
-    testonly = true
-    deps = [
-      ":resources_unitjs_tests",
-    ]
-  }
-} else {
-  source_set("browser_tests") {
-    testonly = true
-  }
+source_set("browser_tests_js") {
+  testonly = true
+  deps = [
+    ":resources_unitjs_tests",
+  ]
 }

chrome/test/BUILD.gn

@@ -672,7 +672,6 @@ if (!is_android) {
       "//chrome/browser/devtools:test_support",
       "//chrome/browser/notifications/scheduler/test:test_support",
       "//chrome/browser/profiling_host:profiling_browsertests",
-      "//chrome/browser/resources:browser_tests",
       "//chrome/browser/web_applications:browser_tests",
       "//chrome/browser/web_applications/extensions:browser_tests",
       "//chrome/renderer",
@@ -1466,6 +1465,7 @@ if (!is_android) {
 
     if (include_js_tests) {
       deps += [
+        "//chrome/browser/resources:browser_tests_js",
         "//chrome/test/data/webui:browser_tests_js_mojo_lite_webui",
         "//chrome/test/data/webui:browser_tests_js_webui",
       ]