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

chrome/test/BUILD.gn

Index: chrome/test/BUILD.gn
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 8f5ab6cf163db878e752e6140e9719e10e111b3a..8962d6ec7bb76cb50c88f701c27d3cc383bce17d 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -6,6 +6,7 @@ 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")

[Nick Bray (chromium), 2015/02/05 23:21:46]

Unlike the other CL, I think this is correct.  (Different repo, different
rules.)

[Dirk Pranke, 2015/02/05 23:52:19]

right.

 import("//testing/test.gni")
 
 # This target exists to reference other test executables to bring these files
@@ -328,11 +329,11 @@ if (!is_android && (!is_win || link_chrome_on_windows)) {
         "//chromeos",
       ]
 
-      if (enable_nacl) {
-        # TODO(GYP) this is also under a disable_nacl_untrusted==0 condition.
+      if (enable_nacl && enable_nacl_untrusted) {
         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)
         ]
       }
@@ -578,7 +579,10 @@ if (!is_android && (!is_win || link_chrome_on_windows)) {
         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" ]
@@ -672,7 +676,7 @@ if (!is_android && (!is_win || link_chrome_on_windows)) {
       "//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', {
@@ -703,28 +707,26 @@ if (!is_android && (!is_win || link_chrome_on_windows)) {
           "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)",
+          # "../ppapi/ppapi_nacl.gyp:ppapi_nacl_tests",

[brettw, 2015/02/05 00:20:36]

You kept these commented out but removed the TODOs. Can you put the TODOs back?
I like to be able to gpre for "TODO(GYP)" to find a list of deps that are
missing.

+          # "../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions_background_keepalive",
+          # "../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions_media_galleries",
+          # "../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions_packaged_app",
+          # "../ppapi/ppapi_tests_mojo.gyp:ppapi_tests_mojo",
         ]
         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
@@ -734,16 +736,14 @@ if (!is_android && (!is_win || link_chrome_on_windows)) {
           #'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",

[brettw, 2015/02/05 00:20:36]

Ditto

         ]
       }
-      if (!is_chromeos) {
-        sources -= [ "test/data/chromeos/oobe_webui_browsertest.js" ]
-      }
     }
     if (debug_devtools) {
       defines += [ "DEBUG_DEVTOOLS=1" ]