From 0884a315e82ec12d1ebc336050f2e24b611338d5 Mon Sep 17 00:00:00 2001 From: "robertshield@chromium.org" Date: Sat, 1 Mar 2014 01:23:24 +0000 Subject: 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 --- chrome_elf/blacklist/blacklist.cc | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'chrome_elf/blacklist/blacklist.cc') 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( - 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) { -- cgit v1.1