0

Revert 100328 - Prevent the renderer from dying if launched under App-V/SoftGrid.

We found a better workaround, so removing this one.

BUG=95888
Review URL: http://codereview.chromium.org/7857022

TBR=nsylvain@chromium.org
Review URL: http://codereview.chromium.org/7988006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102289 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
jschuh@chromium.org
2011-09-22 16:06:00 +00:00
parent 9573aad709
commit 0b51e64be2

@@ -71,12 +71,8 @@ ResultCode TargetServicesBase::Init() {
// Failure here is a breach of security so the process is terminated.
void TargetServicesBase::LowerToken() {
DWORD error_code = SetProcessIntegrityLevel(g_shared_delayed_integrity_level);
// Here we don't terminate the process if the error is ERROR_INVALID_HANDLE,
// this is because this error is not possible in normal circumstances, unless
// it is hooked by sftldr_wow64.dll, in which case we prefer to keep running.
// See http://crbug.com/95888.
if (ERROR_SUCCESS != error_code && ERROR_INVALID_HANDLE != error_code)
if (ERROR_SUCCESS !=
SetProcessIntegrityLevel(g_shared_delayed_integrity_level))
::TerminateProcess(::GetCurrentProcess(), SBOX_FATAL_INTEGRITY);
process_state_.SetRevertedToSelf();
// If the client code as called RegOpenKey, advapi32.dll has cached some