Disable NaCl browser_tests for 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/chrome_build.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//chrome/chrome_tests.gni")
 import("//chrome/test/base/js2gtest.gni")
@@ skipping 660 matching lines @@
       "//ppapi:ppapi_tests",
       "//ppapi:power_saver_test_plugin",
       "//remoting/webapp:browser_test_resources",
       "//remoting/webapp:unit_tests",
       "//third_party/mesa:osmesa",
       "//third_party/widevine/cdm:widevine_test_license_server",
     ]
 
     defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
 
+    # TODO(GYP) http://crbug.com/462791
+    defines += [ "DISABLE_NACL_BROWSERTESTS" ]
+    declare_args() {

[brettw, 2015/08/07 21:11:57]

Can you put this declare_args at the top of the file after the imports? That's
where I normally put it.

[jam, 2015/08/07 21:16:35]

Done.

+      # Switches to using platform functions instead of ICU on Android.

[brettw, 2015/08/07 21:11:57]

This comment is, um, wrong.

[jam, 2015/08/07 21:16:35]

Done.

+      enable_nacl_browsertests = false
+    }
+
     # TODO(GYP) if (is_win) {
     #       ['incremental_chrome_dll==1', {
     #         'UseLibraryDependencyInputs': "true",
     # }
 
     if (cld_version == 2) {
       # Because the browser_tests use translate, they need CLD data.
       deps += [ "//third_party/cld_2:cld2_platform_impl" ]
     }
 
     if (!enable_one_click_signin) {
       sources -= [ "../browser/ui/sync/one_click_signin_bubble_links_delegate_browsertest.cc" ]
     }
-    if (enable_nacl) {
+    if (!enable_nacl_browsertests) {
+      sources -= [ "../browser/extensions/api/hotword_private/hotword_private_apitest.cc" ]
+    } else if (enable_nacl) {
       sources += [
         "../browser/extensions/extension_nacl_browsertest.cc",
         "../browser/nacl_host/test/gdb_debug_stub_browsertest.cc",
       ]
       deps += [ "//components/nacl/renderer/plugin:nacl_trusted_plugin" ]
 
       if (enable_nacl_untrusted) {
         sources += [
           "nacl/nacl_browsertest.cc",
           "nacl/nacl_browsertest_uma.cc",
@@ skipping 244 matching lines @@
         "../renderer/spellchecker/spellcheck_provider_hunspell_unittest.cc",
         "../renderer/spellchecker/spellcheck_unittest.cc",
       ]
     }
     if (is_chromeos) {
       sources += [
         "../browser/extensions/api/networking_private/networking_private_apitest.cc",
         "../browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc",
       ]
     }
-    if (!is_android && !is_ios) {
+    if (!is_android && !is_ios && enable_nacl_browsertests) {
       sources +=
           [ "../browser/copresence/chrome_whispernet_client_browsertest.cc" ]
       deps += [ "//components/copresence" ]
     }
     if (enable_app_list) {
       sources += rebase_path(
               chrome_tests_gypi_values.chrome_browser_tests_app_list_sources,
               ".",
               "//chrome")
     }
@@ skipping 923 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")
   }
 }