repair disable_nacl=1

build/all.gyp

 # Copyright (c) 2012 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.
 
 {
   'targets': [
     {
       'target_name': 'All',
       'type': 'none',
       'xcode_create_dependents_test_runner': 1,
@@ skipping 173 matching lines @@
         '../content/content.gyp:content_browsertests',
         '../content/content.gyp:content_unittests',
         '../crypto/crypto.gyp:crypto_unittests',
         '../ui/ui.gyp:gfx_unittests',
         '../gpu/gpu.gyp:gpu_unittests',
         '../gpu/gles2_conform_support/gles2_conform_support.gyp:gles2_conform_support',
         '../ipc/ipc.gyp:ipc_tests',
         '../jingle/jingle.gyp:jingle_unittests',
         '../media/media.gyp:media_unittests',
         '../net/net.gyp:net_unittests',
-        # TODO(bbudge): drop this when we have switched the NaCl proxy to IPC.
-        '../ppapi/ppapi_proxy_untrusted.gyp:ppapi_proxy_untrusted',
         '../printing/printing.gyp:printing_unittests',
         '../remoting/remoting.gyp:remoting_unittests',
         '../sql/sql.gyp:sql_unittests',
         '../sync/sync.gyp:sync_unit_tests',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
         '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
         'temp_gyp/googleurl.gyp:googleurl_unittests',
       ],
       'conditions': [
         ['OS=="win"', {
@@ skipping 11 matching lines @@
             '../chrome_frame/chrome_frame.gyp:npchrome_frame',
             '../courgette/courgette.gyp:courgette_unittests',
             '../sandbox/sandbox.gyp:sbox_integration_tests',
             '../sandbox/sandbox.gyp:sbox_unittests',
             '../sandbox/sandbox.gyp:sbox_validation_tests',
             '../webkit/webkit.gyp:pull_in_copy_TestNetscapePlugIn',
             '../ui/views/views.gyp:views_unittests',
             '../webkit/webkit.gyp:test_shell_common',
            ],
         }],
+        ['disable_nacl==0 and disable_nacl_untrusted==0', {
+          'dependencies': [
+            # TODO(bbudge): drop this when we have switched the NaCl proxy to IPC.
+            '../ppapi/ppapi_proxy_untrusted.gyp:ppapi_proxy_untrusted',
+          ],
+        }],
       ],
     }, # target_name: chromium_builder_tests
     {
       'target_name': 'chromium_2010_builder_tests',
       'type': 'none',
       'dependencies': [
         'chromium_builder_tests',
       ],
     }, # target_name: chromium_2010_builder_tests
     {
@@ skipping 376 matching lines @@
               'dependencies': [
                 '../chromeos/chromeos.gyp:chromeos_unittests',
               ],
             }],
           ],
         },
       ],  # targets
     }], # "use_aura==1"
   ], # conditions
 }