diff options
| author | ncbray@chromium.org <ncbray@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-06 17:12:14 +0000 |
|---|---|---|
| committer | ncbray@chromium.org <ncbray@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-06 17:12:14 +0000 |
| commit | e617cd7ae2ac3ddf95778feef1c2da005070c9a2 (patch) | |
| tree | f3dd2e9b18abdd1d3cc002cd2e96db9027b9a184 /chrome/browser/nacl_host | |
| parent | 44e2d5d457fbd201ecc5b0371514e44ac6ec67cb (diff) | |
| download | chromium_src-e617cd7ae2ac3ddf95778feef1c2da005070c9a2.zip chromium_src-e617cd7ae2ac3ddf95778feef1c2da005070c9a2.tar.gz chromium_src-e617cd7ae2ac3ddf95778feef1c2da005070c9a2.tar.bz2 | |
Disable validation caching on ChromeOS.
ChromeOS's version of NSS contains a check that is breaking NaCl when caching
is enabled.
BUG= http://code.google.com/p/chromium/issues/detail?id=131218
TEST= none
Review URL: https://chromiumcodereview.appspot.com/10532018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140783 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/nacl_host')
| -rw-r--r-- | chrome/browser/nacl_host/nacl_browser.cc | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/chrome/browser/nacl_host/nacl_browser.cc b/chrome/browser/nacl_host/nacl_browser.cc index 9b27a35..0e36913 100644 --- a/chrome/browser/nacl_host/nacl_browser.cc +++ b/chrome/browser/nacl_host/nacl_browser.cc @@ -21,6 +21,15 @@ const char kValidationCacheSequenceName[] = "NaClValidationCache"; const FilePath::CharType kValidationCacheFileName[] = FILE_PATH_LITERAL("nacl_validation_cache.bin"); +#if defined(CHROMEOS) +// TODO(ncbray) enable on ChromeOS. +// http://code.google.com/p/chromium/issues/detail?id=131218 +const bool kValidationCacheEnabledByDefault = false; +#else +const bool kValidationCacheEnabledByDefault = true; +#endif + + enum ValidationCacheStatus { CACHE_MISS = 0, CACHE_HIT, @@ -92,7 +101,9 @@ NaClBrowser::NaClBrowser() irt_filepath_(), irt_state_(NaClResourceUninitialized), validation_cache_file_path_(), - validation_cache_is_enabled_(CheckEnvVar("NACL_VALIDATION_CACHE", true)), + validation_cache_is_enabled_( + CheckEnvVar("NACL_VALIDATION_CACHE", + kValidationCacheEnabledByDefault)), validation_cache_is_modified_(false), validation_cache_state_(NaClResourceUninitialized), ok_(true) { |