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

chrome/browser/nacl_host/nacl_browser.cc

 // 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.
 
 #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"
 #include "base/pickle.h"
 #include "base/win/windows_version.h"
 #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 {
 
 // An arbitrary delay to coalesce multiple writes to the cache.
 const int kValidationCacheCoalescingTimeMS = 6000;
 const char kValidationCacheSequenceName[] = "NaClValidationCache";
 const FilePath::CharType kValidationCacheFileName[] =
     FILE_PATH_LITERAL("nacl_validation_cache.bin");
 
 const bool kValidationCacheEnabledByDefault = true;
 
 enum ValidationCacheStatus {
   CACHE_MISS = 0,
   CACHE_HIT,
   CACHE_MAX
 };
 
-// Determine the name of the IRT file based on the architecture.
-#define NACL_IRT_FILE_NAME(arch_string) \
-  (FILE_PATH_LITERAL("nacl_irt_")       \
-   FILE_PATH_LITERAL(arch_string)       \
-   FILE_PATH_LITERAL(".nexe"))
+const FilePath::StringType NaClIrtName() {
+  FilePath::StringType irt_name;
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableNaClIPCProxy))
+    irt_name.append(FILE_PATH_LITERAL("nacl_ipc_irt_"));
+  else
+    irt_name.append(FILE_PATH_LITERAL("nacl_irt_"));
 
-const FilePath::StringType NaClIrtName() {
 #if defined(ARCH_CPU_X86_FAMILY)
 #if defined(ARCH_CPU_X86_64)
   bool is64 = true;
 #elif defined(OS_WIN)
   bool is64 = (base::win::OSInfo::GetInstance()->wow64_status() ==
                base::win::OSInfo::WOW64_ENABLED);
 #else
   bool is64 = false;
 #endif
-  return is64 ? NACL_IRT_FILE_NAME("x86_64") : NACL_IRT_FILE_NAME("x86_32");
+  if (is64)
+    irt_name.append(FILE_PATH_LITERAL("x86_64"));
+  else
+    irt_name.append(FILE_PATH_LITERAL("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
   // choice, which would require substantial refactoring.
-  return NACL_IRT_FILE_NAME("arm");
+  irt_name.append(FILE_PATH_LITERAL("arm"));
 #else
 #error Add support for your architecture to NaCl IRT file selection
 #endif
+  irt_name.append(FILE_PATH_LITERAL(".nexe"));
+  return irt_name;
 }
 
 bool CheckEnvVar(const char* name, bool default_value) {
   bool result = default_value;
   const char* var = getenv(name);
   if (var && strlen(var) > 0) {
     result = var[0] != '0';
   }
   return result;
 }
@@ skipping 320 matching lines @@
     // because it can degrade the responsiveness of the browser.
     // The task is sequenced so that multiple writes happen in order.
     content::BrowserThread::PostBlockingPoolSequencedTask(
         kValidationCacheSequenceName,
         FROM_HERE,
         base::Bind(WriteCache, validation_cache_file_path_,
                    base::Owned(pickle)));
   }
   validation_cache_is_modified_ = false;
 }