diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-01 01:23:24 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-01 01:23:24 +0000 |
| commit | 0884a315e82ec12d1ebc336050f2e24b611338d5 (patch) | |
| tree | 296d42d0a130bab47d64c7c5e2b607237e496ea0 /chrome_elf/blacklist/blacklist.cc | |
| parent | 8834a3b3a4d52040e9e8436e20fa2dd0536b82a4 (diff) | |
| download | chromium_src-0884a315e82ec12d1ebc336050f2e24b611338d5.zip chromium_src-0884a315e82ec12d1ebc336050f2e24b611338d5.tar.gz chromium_src-0884a315e82ec12d1ebc336050f2e24b611338d5.tar.bz2 | |
Unify browser process type checks in Chrome ELF.
Use both IsSandboxed and command line flag.
BUG=329023
TEST=chrome_elf_unittests
Review URL: https://codereview.chromium.org/181863002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254308 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_elf/blacklist/blacklist.cc')
| -rw-r--r-- | chrome_elf/blacklist/blacklist.cc | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/chrome_elf/blacklist/blacklist.cc b/chrome_elf/blacklist/blacklist.cc index 73383d5..5ce3773 100644 --- a/chrome_elf/blacklist/blacklist.cc +++ b/chrome_elf/blacklist/blacklist.cc @@ -9,6 +9,7 @@ #include "base/basictypes.h" #include "chrome_elf/blacklist/blacklist_interceptions.h" #include "chrome_elf/chrome_elf_constants.h" +#include "chrome_elf/chrome_elf_util.h" #include "sandbox/win/src/interception_internal.h" #include "sandbox/win/src/internal_types.h" #include "sandbox/win/src/sandbox_utils.h" @@ -141,17 +142,6 @@ class OSInfo { DISALLOW_COPY_AND_ASSIGN(OSInfo); }; -bool IsNonBrowserProcess() { - 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 // key handle since it is no longer needed. void RecordSuccessfulThunkSetup(HKEY* key) { |