Revert 151581 - Eliminate the 'build_ppapi_ipc_proxy_untrusted' build flag for untrusted PPAPI prox…

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 138 matching lines @@
         ['remoting==1', {
           'dependencies': [
             '../remoting/remoting.gyp:*',
           ],
         }],
         ['use_openssl==0', {
           'dependencies': [
             '../net/third_party/nss/ssl.gyp:*',
           ],
         }],
+        ['disable_nacl==0 and disable_nacl_untrusted==0', {
+          'dependencies': [
+            '../base/base_untrusted.gyp:*',
+            '../ipc/ipc_untrusted.gyp:*',
+            '../ppapi/ppapi_proxy_untrusted.gyp:*',
+            '../ppapi/ppapi_shared_untrusted.gyp:*',
+          ],
+        }],
       ],
     }, # target_name: All
     {
       'target_name': 'All_syzygy',
       'type': 'none',
       'conditions': [
         ['OS=="win" and fastbuild==0', {
             'dependencies': [
               '../chrome/installer/mini_installer_syzygy.gyp:*',
             ],
@@ skipping 60 matching lines @@
             '../webkit/webkit.gyp:pull_in_copy_TestNetscapePlugIn',
             '../ui/views/views.gyp:views_unittests',
             '../webkit/webkit.gyp:test_shell_common',
            ],
         }],
         ['OS=="linux"', {
           'dependencies': [
             '../sandbox/sandbox.gyp:sandbox_linux_unittests',
           ],
         }],
+        ['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 424 matching lines @@
             '../base/base.gyp:base_unittests_run',
             '../chrome/chrome.gyp:browser_tests_run',
             '../chrome/chrome.gyp:unit_tests_run',
             '../net/net.gyp:net_unittests_run',
           ],
         }, # target_name: chromium_swarm_tests
       ],
     }],
   ], # conditions
 }