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

chrome/browser/nacl_host/nacl_browser.cc

Index: chrome/browser/nacl_host/nacl_browser.cc
===================================================================
--- chrome/browser/nacl_host/nacl_browser.cc	(revision 151201)
+++ chrome/browser/nacl_host/nacl_browser.cc	(working copy)
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/nacl_host/nacl_browser.h"
 
+#include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
@@ -12,6 +13,7 @@
 #include "build/build_config.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_paths_internal.h"
+#include "chrome/common/chrome_switches.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace {
@@ -31,8 +33,9 @@
 };
 
 // Determine the name of the IRT file based on the architecture.
-#define NACL_IRT_FILE_NAME(arch_string) \
-  (FILE_PATH_LITERAL("nacl_irt_")       \
+#define NACL_IRT_FILE_NAME(type, arch_string) \
+  (FILE_PATH_LITERAL(type)              \
+   FILE_PATH_LITERAL("_")               \
    FILE_PATH_LITERAL(arch_string)       \
    FILE_PATH_LITERAL(".nexe"))
 
@@ -46,7 +49,14 @@
 #else
   bool is64 = false;
 #endif
-  return is64 ? NACL_IRT_FILE_NAME("x86_64") : NACL_IRT_FILE_NAME("x86_32");
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableNaClIPCProxy)) {
+    return is64 ? NACL_IRT_FILE_NAME("nacl_chrome_irt", "x86_64") :

[Mark Seaborn, 2012/08/14 01:12:05]

Chrome's existing irt.nexe is Chrome-specific too, so this name could be
confusing.  How about "nacl_ipc_proxy_irt"?

[dmichael (off chromium), 2012/08/14 17:03:31]

Bill and I had talked about that name, too. It would be nice to have a name that
we like _after_ the switch too (rather than renaming the new IRT to the old IRT
name when we pull the switch). nacl_chrome_irt seemed like a good compromise in
the absence of any perfect name.

[bbudge, 2012/08/14 18:35:18]

'nacl_ipc_irt' was both David's and my first idea. Since it's yours too Mark,
perhaps I'm over-thinking this. Done.

+                  NACL_IRT_FILE_NAME("nacl_chrome_irt", "x86_32");
+  } else {
+    return is64 ? NACL_IRT_FILE_NAME("nacl_irt", "x86_64") :
+                  NACL_IRT_FILE_NAME("nacl_irt", "x86_32");
+  }
 #elif defined(ARCH_CPU_ARMEL)
   // TODO(mcgrathr): Eventually we'll need to distinguish arm32 vs thumb2.
   // That may need to be based on the actual nexe rather than a static