Add a switch for using PNaCl Subzero and use it for -O0 translation.

components/nacl/browser/pnacl_translation_cache.cc

 // Copyright 2013 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 "components/nacl/browser/pnacl_translation_cache.h"
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
@@ skipping 396 matching lines @@
 // Beware that any changes to this function or to PnaclCacheInfo will
 // effectively invalidate existing translation cache entries.
 
 // static
 std::string PnaclTranslationCache::GetKey(const nacl::PnaclCacheInfo& info) {
   if (!info.pexe_url.is_valid() || info.abi_version < 0 || info.opt_level < 0 ||
       info.extra_flags.size() > 512)
     return std::string();
   std::string retval("ABI:");
   retval += IntToString(info.abi_version) + ";" + "opt:" +
-            IntToString(info.opt_level) + ";" + "URL:";
+            IntToString(info.opt_level) +
+            (info.use_subzero ? "subzero;" : ";") + "URL:";
   // Filter the username, password, and ref components from the URL
   GURL::Replacements replacements;
   replacements.ClearUsername();
   replacements.ClearPassword();
   replacements.ClearRef();
   GURL key_url(info.pexe_url.ReplaceComponents(replacements));
   retval += key_url.spec() + ";";
   // You would think that there is already code to format base::Time values
   // somewhere, but I haven't found it yet. In any case, doing it ourselves
   // here means we can keep the format stable.
@@ skipping 15 matching lines @@
 }
 
 int PnaclTranslationCache::DoomEntriesBetween(
     base::Time initial,
     base::Time end,
     const CompletionCallback& callback) {
   return disk_cache_->DoomEntriesBetween(initial, end, callback);
 }
 
 }  // namespace pnacl