Revert "PNaCl: Enable the Subzero translator for x86-32 without a flag."

This reverts commit bcfc0fcc956c7523eb3788dcb8f855f5b912690f.

XP tests for PNaCl error tests are failing.  Subzero's error handling is apparently different in some respect from llc's error handling.  See http://build.chromium.org/p/chromium.win/builders/XP%20Tests%20%281%29/builds/41379

BUG=532718
TBR=mseaborn

Review URL: https://codereview.chromium.org/1486453002

Cr-Commit-Position: refs/heads/master@{#362070}

1 files changed, 3 insertions, 8 deletions

diff --git a/components/nacl/renderer/ppb_nacl_private_impl.cc b/components/nacl/renderer/ppb_nacl_private_impl.cc
index dfc7af8..dde4ef8 100644
--- a/components/nacl/renderer/ppb_nacl_private_impl.cc
+++ b/components/nacl/renderer/ppb_nacl_private_impl.cc
@@ -1092,15 +1092,10 @@ PP_Bool ManifestGetProgramURL(PP_Instance instance,
     *pp_full_url = ppapi::StringVar::StringToPPVar(full_url);
     *pp_uses_nonsfi_mode = PP_FromBool(uses_nonsfi_mode);
     // Check if we should use Subzero (x86-32 / non-debugging case for now).
-    // TODO(stichnot): When phasing in Subzero for a new target architecture,
-    // add it behind the --enable-pnacl-subzero flag, and add a clause here:
-    //   && base::CommandLine::ForCurrentProcess()->HasSwitch(
-    //         switches::kEnablePNaClSubzero)
-    // Also modify the ValidationCacheOfTranslatorNexes test to match.  When
-    // Subzero is finally fully released for all sandbox architectures, the
-    // --enable-pnacl-subzero flag can be removed.
     if (pnacl_options->opt_level == 0 && !pnacl_options->is_debug &&
-        strcmp(GetSandboxArch(), "x86-32") == 0) {
+        strcmp(GetSandboxArch(), "x86-32") == 0 &&
+        base::CommandLine::ForCurrentProcess()->HasSwitch(
+            switches::kEnablePNaClSubzero)) {
       pnacl_options->use_subzero = PP_TRUE;
       // Subzero -O2 is closer to LLC -O0, so indicate -O2.
       pnacl_options->opt_level = 2;