Move gaia_auth_host:browser_tests to include_js_tests

Include gaia_auth_host:browser_tests only if include_js_tests flag is
true.

Bug: 1061915
Change-Id: I25afe8abd9a94142658d91d916b678663f6a42f9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2106175Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Anastasiia Nikolaienko <anastasiian@chromium.org>
Cr-Commit-Position: refs/heads/master@{#750957}

chrome/browser/resources/gaia_auth_host/BUILD.gn

@@ -3,28 +3,34 @@
 # found in the LICENSE file.
 
 import("//chrome/test/base/js2gtest.gni")
+import("//chrome/test/include_js_tests.gni")
 import("//third_party/closure_compiler/compile_js.gni")
 import("//ui/webui/resources/tools/js_modulizer.gni")
 
-js2gtest("login_unitjs_tests") {
-  # These could be unit tests, except they need a browser context in order
-  # to construct a DOMParser object - so they are webui tests.
-  test_type = "webui"
-  sources = [
-    "saml_password_attributes_test.unitjs",
-    "saml_timestamps_test.unitjs",
-  ]
-  gen_include_files = [
-    "saml_password_attributes.js",
-    "saml_timestamps.js",
-    "//ui/webui/resources/js/cr.js",
-  ]
-  defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
-}
+# Since js2gtest()s don't compile in some scenarios when include_js_tests is
+# false, and since this file may be loaded even when it's false, we need to make
+# sure the js2gtest() target only exists in this file when it works.
+if (is_chromeos && include_js_tests) {
+  js2gtest("login_unitjs_tests") {
+    # These could be unit tests, except they need a browser context in order
+    # to construct a DOMParser object - so they are webui tests.
+    test_type = "webui"
+    sources = [
+      "saml_password_attributes_test.unitjs",
+      "saml_timestamps_test.unitjs",
+    ]
+    gen_include_files = [
+      "saml_password_attributes.js",
+      "saml_timestamps.js",
+      "//ui/webui/resources/js/cr.js",
+    ]
+    defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
+  }
 
-source_set("browser_tests") {
-  testonly = true
-  deps = [ ":login_unitjs_tests" ]
+  source_set("browser_tests") {
+    testonly = true
+    deps = [ ":login_unitjs_tests" ]
+  }
 }
 
 js_type_check("closure_compile") {

chrome/test/BUILD.gn

@@ -1465,7 +1465,6 @@ if (!is_android) {
         "//chrome/browser/chromeos:test_support",
         "//chrome/browser/media/router:test_support",
         "//chrome/browser/resources/chromeos/accessibility:browser_tests",
-        "//chrome/browser/resources/gaia_auth_host:browser_tests",
         "//chrome/services/file_util/public/cpp:browser_tests",
         "//chromeos:test_support",
         "//chromeos/components/drivefs:test_support",
@@ -1505,6 +1504,7 @@ if (!is_android) {
       ]
       if (is_chromeos) {
         deps += [
+          "//chrome/browser/resources/gaia_auth_host:browser_tests",
           "//chromeos/components/help_app_ui:browser_tests_js",
           "//chromeos/components/media_app_ui:browser_tests_js",
         ]