Build nacl_helper_nonsfi with GN

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/chrome_build.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//chrome/chrome_tests.gni")
@@ skipping 418 matching lines @@
         # Use only the _chromeos version on ChromeOS.
         "base/view_event_test_platform_part_ash.cc",
       ]
 
       deps += [
         "//ash/resources",
         "//chromeos",
       ]
 
       if (enable_nacl) {
-        deps += [
+        data_deps += [
           "//native_client/src/trusted/service_runtime/linux:munge_nacl_helper_bootstrap",
           "//components/nacl:nacl_helper",
-
-          # '../components/nacl_nonsfi.gyp:nacl_helper_nonsfi',  TODO(GYP)
+          "//components/nacl:nacl_helper_nonsfi(//build/toolchain/nacl:newlib_pnacl_nonsfi)",
         ]
       }
 
       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",
         ]
       }
     } else {
@@ skipping 537 matching lines @@
           #'chrome.gyp:chrome_nacl_win64',  TODO(GYP) bug 512869
         ]
         configs -= [ "//build/config/win:default_incremental_linking" ]
         configs +=
             [ "//build/config/win:default_large_module_incremental_linking" ]
       }
       if (is_linux) {
         data_deps += [
           "//native_client/src/trusted/service_runtime/linux:munge_nacl_helper_bootstrap",
           "//components/nacl:nacl_helper",
-
-          # "//components/nacl_nonsfi.gyp:nacl_helper_nonsfi",  # TODO(GYP) bug 512912.
+          "//components/nacl:nacl_helper_nonsfi(//build/toolchain/nacl:newlib_pnacl_nonsfi)",
         ]
       }
     }
     if (debug_devtools) {
       defines += [ "DEBUG_DEVTOOLS=1" ]
     }
     if (use_ash) {
       deps += [ "//ash:test_support" ]
     }
     if (use_aura || toolkit_views) {
@@ skipping 1153 matching lines @@
     "//third_party/mojo/src/mojo/edk/system",
   ]
 
   if (!is_android && use_ash) {
     sources += rebase_path(
             chrome_tests_unit_gypi_values.chrome_test_support_unit_ash_sources,
             ".",
             "//chrome")
   }
 }