diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-12 18:28:59 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-12 18:28:59 +0000 |
| commit | 8363bbebb51a72283ef14ecc765565b0f01fe59c (patch) | |
| tree | 2d7bc2cf6e60529d38f4ef92dfbdf771883db813 /chrome_elf | |
| parent | 1fcd73c1e0a94e68d7b267a530c80240a010d8a1 (diff) | |
| download | chromium_src-8363bbebb51a72283ef14ecc765565b0f01fe59c.zip chromium_src-8363bbebb51a72283ef14ecc765565b0f01fe59c.tar.gz chromium_src-8363bbebb51a72283ef14ecc765565b0f01fe59c.tar.bz2 | |
Revert of Revert blacklist part of crrev.com/250682. (https://codereview.chromium.org/160373002/)
Reason for revert:
As discussed, this shouldn't interfere with the metrics we care about.
Original issue's description:
> Revert blacklist part of crrev.com/250682.
>
> Don't want the new check in just yet, it will interfere with metrics.
>
> BUG=329023
> TBR=csharp
> NOTRY=true
> NOTREECHECKS=TRUE
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=250704
TBR=csharp@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=329023
Review URL: https://codereview.chromium.org/160643002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250758 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_elf')
| -rw-r--r-- | chrome_elf/blacklist/blacklist.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/chrome_elf/blacklist/blacklist.cc b/chrome_elf/blacklist/blacklist.cc index bf48435..ea140c4 100644 --- a/chrome_elf/blacklist/blacklist.cc +++ b/chrome_elf/blacklist/blacklist.cc @@ -138,8 +138,14 @@ class OSInfo { }; bool IsNonBrowserProcess() { - wchar_t* command_line = GetCommandLine(); - return (command_line && wcsstr(command_line, L"--type")); + typedef bool (*IsSandboxedProcessFunc)(); + IsSandboxedProcessFunc is_sandboxed_process = + reinterpret_cast<IsSandboxedProcessFunc>( + GetProcAddress(GetModuleHandle(NULL), "IsSandboxedProcess")); + if (is_sandboxed_process && is_sandboxed_process()) + return true; + + return false; } // Record that the thunk setup completed succesfully and close the registry |