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("//testing/test.gni")
 
@@ skipping 310 matching lines @@
         # 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.
         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 223 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 104 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",  # TODO(GYP)
+          "//ppapi/native_client:nacl_irt(//native_client/build/toolchain/nacl:irt_x64)",

[Nick Bray (chromium), 2015/02/25 22:52:40]

assert(current_cpu == 'x64') ?  I think there's another place in BUILDCONFIG you
could do this?

[Dirk Pranke, 2015/02/25 23:23:39]

ok.

+          # "../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 527 matching lines @@
       if (is_chromeos) {
         sources -= [
           "../browser/ui/sync/one_click_signin_helper_unittest.cc",
           "../browser/ui/sync/one_click_signin_sync_starter_unittest.cc",
         ]
       }
       if (!toolkit_views) {
         sources -= [ "../browser/ui/views/sync/one_click_signin_bubble_view_unittest.cc" ]
       }
     }
-    if (enable_nacl) {
-      sources += rebase_path(unit_gypi_values.chrome_unit_tests_nacl_sources,
-                             ".",
-                             "//chrome")
-    }
+
     if (enable_extensions) {
       sources +=
           rebase_path(unit_gypi_values.chrome_unit_tests_extensions_sources,
                       ".",
                       "//chrome")
       deps += [
         "//chrome/common/extensions/api",
         "//extensions:extensions_resources",
         "//extensions/strings",
       ]
@@ skipping 359 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" ]
     }
   }
 }