Bug 1358227 - Removed the MOZ_ALLOW_WEAKER_SANDBOX environment variable; r=jimm

The Flash sandbox (which is the only thing this variable is used for) is stable
at this point, and for testing purposes we still have MOZ_DISABLE_NPAPI_SANDBOX.

MozReview-Commit-ID: 6sxb1tx7oA9

--HG--
extra : rebase_source : d960c5a7afb04b90f098516f955b5fd00628b6a8
This commit is contained in:
Alex Gaynor 2017-05-31 12:28:06 -04:00
Родитель eb3becc0b0
Коммит 1bc2391571
1 изменённых файлов: 4 добавлений и 5 удалений

Просмотреть файл

@ -435,10 +435,9 @@ nsPluginTag::InitSandboxLevel()
#if defined(_AMD64_)
// As level 2 is now the default NPAPI sandbox level for 64-bit flash, we
// don't want to allow a lower setting unless this environment variable is
// set. This should be changed if the firefox.js pref file is changed.
if (mIsFlashPlugin &&
!PR_GetEnv("MOZ_ALLOW_WEAKER_SANDBOX") && mSandboxLevel < 2) {
// don't want to allow a lower setting. This should be changed if the
// firefox.js pref file is changed.
if (mIsFlashPlugin && mSandboxLevel < 2) {
mSandboxLevel = 2;
}
#endif
@ -487,7 +486,7 @@ nsresult nsPluginTag::EnsureMembersAreUTF8()
ConvertToUTF8(decoder, mFileName);
ConvertToUTF8(decoder, mFullPath);
}
// The description of the plug-in and the various MIME type descriptions
// should be encoded in the standard plain text file encoding for this system.
// XXX should we add kPlatformCharsetSel_PluginResource?