Add sandbox ISA and extra compile flag fields to PNaCl translation cache key

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 380 matching lines @@
   in_memory_ = true;
   return Init(net::MEMORY_CACHE, base::FilePath(), kMaxMemCacheSize, callback);
 }
 
 int PnaclTranslationCache::Size() {
   if (!disk_cache_)
     return -1;
   return disk_cache_->GetEntryCount();
 }
 
+// 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)
+  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:";
   // 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.
   base::Time::Exploded exploded;
   info.last_modified.UTCExplode(&exploded);
   if (info.last_modified.is_null() || !exploded.HasValidValues()) {
     memset(&exploded, 0, sizeof(exploded));
   }
   retval += "modified:" + IntToString(exploded.year) + ":" +
             IntToString(exploded.month) + ":" +
             IntToString(exploded.day_of_month) + ":" +
             IntToString(exploded.hour) + ":" + IntToString(exploded.minute) +
             ":" + IntToString(exploded.second) + ":" +
             IntToString(exploded.millisecond) + ":UTC;";
-  retval += "etag:" + info.etag;
+  retval += "etag:" + info.etag + ";";
+  retval += "sandbox:" + info.sandbox_isa + ";";
+  retval += "extra_flags:" + info.extra_flags + ";";
   return retval;
 }
 
 int PnaclTranslationCache::DoomEntriesBetween(
     base::Time initial,
     base::Time end,
     const CompletionCallback& callback) {
   return disk_cache_->DoomEntriesBetween(initial, end, callback);
 }
 
 }  // namespace pnacl