Land prep work to enable NaCl in the Linux x64 GN builds.

chrome/test/BUILD.gn

 # Copyright 2014 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("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/module_args/v8.gni")
+import("//components/nacl/nacl_defines.gni")
 import("//testing/test.gni")
 
 # This target exists to reference other test executables to bring these files
 # into the build.
 group("test") {
   testonly = true
   deps = [
     "//chrome/test/perf",
   ]
 }
@@ skipping 302 matching lines @@
       sources -= [
         # Use only the _chromeos version on ChromeOS.
         "base/view_event_test_platform_part_ash.cc",
       ]
 
       deps += [
         "//ash/resources",
         "//chromeos",
       ]
 
-      if (enable_nacl) {
-        # TODO(GYP) this is also under a disable_nacl_untrusted==0 condition.
+      if (enable_nacl && enable_nacl_untrusted) {

[Nick Bray (chromium), 2015/02/07 02:37:46]

Unless one of these targets has a transitive dependency on the IRT that itsn't
properly gated, there should be no reason to gate this on enable_nacl_untrusted?

[Dirk Pranke, 2015/02/07 02:48:03]

Done.

         deps += [
-          # '../native_client/src/trusted/service_runtime/linux/nacl_bootstrap.gyp:nacl_helper_bootstrap',  TODO(GYP)
-          # '../components/nacl.gyp:nacl_helper',  TODO(GYP)
+          "//native_client/src/trusted/service_runtime/linux:munge_nacl_helper_bootstrap",
+          "//components/nacl:nacl_helper",
+
           # '../components/nacl_nonsfi.gyp:nacl_helper_nonsfi',  TODO(GYP)
         ]
       }
 
       if (is_chrome_branded) {
         sources -= [
           # These tests are failing on official cros bots. crbug.com/431450.
           "../browser/ui/views/bookmarks/bookmark_bar_view_test.cc",
         ]
       }
@@ skipping 225 matching lines @@
 
     js2webui("browser_tests_js_webui") {
       sources = rebase_path(gypi_values.chrome_browser_tests_webui_js_sources,
                             ".",
                             "//chrome")
       if (is_chrome_branded) {
         # crbug.com/230471
         sources -= [ "data/webui/accessibility_audit_browsertest.js" ]
       }
       if (!is_chromeos) {
-        sources -= [ "data/webui/certificate_viewer_dialog_test.js" ]
+        sources -= [
+          "data/webui/certificate_viewer_dialog_test.js",
+          "test/data/chromeos/oobe_webui_browsertest.js",
+        ]
       }
       if (!enable_app_list) {
         sources -= [ "../browser/ui/webui/app_list/start_page_browsertest.js" ]
       }
       if (!enable_supervised_users) {
         sources -=
             [ "../browser/ui/webui/downloads_ui_supervised_browsertest.js" ]
       }
       deps = [
         "//skia",
@@ skipping 73 matching lines @@
 
     # Runtime dependencies
     data_deps = [
       #"//ppapi:ppapi_tests",  # TODO(GYP) this doesn't exist yet.
       #'../remoting/remoting.gyp:remoting_browser_test_resources',  TODO(GYP)
       #'../remoting/remoting.gyp:remoting_webapp_unittest',  TODO(GYP)
       "//third_party/mesa:osmesa",
       "//third_party/widevine/cdm:widevine_test_license_server",
     ]
 
-    defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
+    defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] + nacl_defines
 
     # TODO(GYP) if (is_win) {
     #       ['incremental_chrome_dll==1', {
     #         'UseLibraryDependencyInputs': "true",
     # }
 
     if (cld_version == 0 || cld_version == 2) {
       # Because the browser_tests use translate, they need CLD data.
       deps += [ "//third_party/cld_2:cld2_platform_impl" ]
     }
@@ skipping 10 matching lines @@
 
       if (enable_nacl_untrusted) {
         sources += [
           "nacl/nacl_browsertest.cc",
           "nacl/nacl_browsertest_uma.cc",
           "nacl/nacl_browsertest_util.cc",
           "nacl/nacl_browsertest_util.h",
           "nacl/pnacl_header_test.cc",
           "nacl/pnacl_header_test.h",
         ]
-        deps += [
-          #'test/data/nacl/nacl_test_data.gyp:*',  # TODO(GYP)
-          #'../ppapi/native_client/native_client.gyp:nacl_irt',  # TODO(GYP)
-          #'../ppapi/ppapi_nacl.gyp:ppapi_nacl_tests',  # TODO(GYP)
-          #'../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions_background_keepalive',  # TODO(GYP)
-          #'../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions_media_galleries',  # TODO(GYP)
-          #'../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions_packaged_app',  # TODO(GYP)          #'../ppapi/ppapi_tests_mojo.gyp:ppapi_tests_mojo',  # TODO(GYP)
-          #'../ppapi/ppapi_tests_mojo.gyp:ppapi_tests_mojo',  # TODO(GYP)
+        data_deps += [
+          # "test/data/nacl:shared_test_files",
+          "//ppapi/native_client:nacl_irt(//native_client/build/toolchain/nacl:irt_x64)",

[Nick Bray (chromium), 2015/02/07 02:37:46]

Comment need to architecture support.  There could be a silent weirdness where
we build a 64 bit IRT on 32 bit platforms through this path if this target is
not updated (but others are).  I suspect we actually need an
"build_required_irt" pseudo target that chooses the appropriate toolchain in one
place rather than letting everything that wants the IRT built select the
toolchain.

Your choice to do it in this CL or punt.

[Dirk Pranke, 2015/02/07 02:48:03]

TODO added.

+          # "../ppapi/ppapi_nacl.gyp:ppapi_nacl_tests",  # TODO(GYP)
+          # "../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions_background_keepalive",  # TODO(GYP)
+          # "../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions_media_galleries",  # TODO(GYP)
+          # "../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions_packaged_app",  # TODO(GYP)
+          # "../ppapi/ppapi_tests_mojo.gyp:ppapi_tests_mojo",  # TODO(GYP)
         ]
         if (is_chromeos) {
           sources += [ "//third_party/liblouis/nacl_wrapper/liblouis_wrapper_browsertest.cc" ]
+          deps += [
+            #'browser_chromeos',  TODO(GYP)
+            #'../third_party/liblouis/liblouis_nacl.gyp:liblouis_test_data',  TODO(GYP)
+          ]
         }
-        deps += [
-          #'browser_chromeos',  TODO(GYP)
-          #'../third_party/liblouis/liblouis_nacl.gyp:liblouis_test_data',  TODO(GYP)
-        ]
       }
       if (is_win || is_linux) {
         sources += [ "../browser/nacl_host/test/nacl_gdb_browsertest.cc" ]
-        deps += [
-          #'browser/nacl_host/test/mock_nacl_gdb.gyp:mock_nacl_gdb',  TODO(GYP)
-        ]
+        deps += [ "//chrome/browser/nacl_host/test:mock_nacl_gdb" ]
       }
       if (is_win) {
         # TODO(halyavin) NaCl on Windows can't open debug stub socket in
         # browser process as needed by this test. See http://crbug.com/157312.
         sources -= [ "../browser/nacl_host/test/gdb_debug_stub_browsertest.cc" ]
         deps += [
           #'chrome.gyp:chrome_nacl_win64',  TODO(GYP)
         ]
       }
-      is(is_linux) {
+      if (is_linux) {
         deps += [
-          #'../native_client/src/trusted/service_runtime/linux/nacl_bootstrap.gyp:nacl_helper_bootstrap', TODO(GYP)
-          #'../components/nacl.gyp:nacl_helper', TODO(GYP)
-          #'../components/nacl_nonsfi.gyp:nacl_helper_nonsfi', TODO(GYP)
+          "//native_client/src/trusted/service_runtime/linux:munge_nacl_helper_bootstrap",
+          "//components/nacl:nacl_helper",
+
+          # "//components/nacl_nonsfi.gyp:nacl_helper_nonsfi",  # TODO(GYP)
         ]
       }
-      if (!is_chromeos) {
-        sources -= [ "test/data/chromeos/oobe_webui_browsertest.js" ]
-      }
     }
     if (debug_devtools) {
       defines += [ "DEBUG_DEVTOOLS=1" ]
     }
     if (use_ash) {
       deps += [ "//ash:test_support" ]
     }
     if (use_aura || toolkit_views) {
       deps += [ "//ui/events:test_support" ]
     }
@@ skipping 914 matching lines @@
     }
     if (use_ozone) {
       # crbug.com/354036
       sources -= [ "browser/chromeos/events/event_rewriter_unittest.cc" ]
     }
     if (!enable_plugin_installation) {
       sources -= [ "../browser/plugins/plugin_installer_unittest.cc" ]
     }
   }
 }