Eliminate the 'build_ppapi_ipc_proxy_untrusted' build flag for untrusted PPAPI proxy builds.

This CL removes our custom GYP flag and modifies the build so both the SRPC and IPC proxies are built side by side. In addition, NaClBrowser now checks the '--enable-nacl-ipc-proxy' flag to determine which IRT to load. The IPC proxy's name is of the form 'nacl_ipc_irt_*'. 

BUG=116317
TEST=builds and runs NaCl apps with --enable-nacl-ipc-proxy
TBR=bbudge@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10831316

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151693 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 14 deletions

diff --git a/build/all.gyp b/build/all.gyp
index dcb918b..6af2959 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -156,14 +156,6 @@
             '../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
     {
@@ -244,12 +236,6 @@
             '../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
     {