diff options
Diffstat (limited to 'chrome_elf')
-rw-r--r-- | chrome_elf/blacklist/test/blacklist_test_main_dll.cc | 2 | ||||
-rw-r--r-- | chrome_elf/chrome_elf_main.cc | 2 | ||||
-rw-r--r-- | chrome_elf/chrome_elf_util.cc | 28 | ||||
-rw-r--r-- | chrome_elf/chrome_elf_util.h | 12 | ||||
-rw-r--r-- | chrome_elf/chrome_elf_util_unittest.cc | 6 |
5 files changed, 8 insertions, 42 deletions
diff --git a/chrome_elf/blacklist/test/blacklist_test_main_dll.cc b/chrome_elf/blacklist/test/blacklist_test_main_dll.cc index beb9894..54e5eb8 100644 --- a/chrome_elf/blacklist/test/blacklist_test_main_dll.cc +++ b/chrome_elf/blacklist/test/blacklist_test_main_dll.cc @@ -5,13 +5,11 @@ #include <windows.h> #include "chrome_elf/blacklist/blacklist.h" -#include "chrome_elf/chrome_elf_util.h" extern "C" void InitBlacklistTestDll() {} BOOL APIENTRY DllMain(HMODULE module, DWORD reason, LPVOID reserved) { if (reason == DLL_PROCESS_ATTACH) { - InitializeProcessType(); blacklist::Initialize(true); // force always on, no beacon } diff --git a/chrome_elf/chrome_elf_main.cc b/chrome_elf/chrome_elf_main.cc index 6cedfc7..989493a 100644 --- a/chrome_elf/chrome_elf_main.cc +++ b/chrome_elf/chrome_elf_main.cc @@ -8,7 +8,6 @@ #include "chrome_elf/blacklist/blacklist.h" #include "chrome_elf/breakpad.h" -#include "chrome_elf/chrome_elf_util.h" #include "chrome_elf/ntdll_cache.h" void SignalChromeElf() { @@ -20,7 +19,6 @@ BOOL APIENTRY DllMain(HMODULE module, DWORD reason, LPVOID reserved) { InitializeCrashReporting(); __try { - InitializeProcessType(); InitCache(); blacklist::Initialize(false); // Don't force, abort if beacon is present. } __except(GenerateCrashDump(GetExceptionInformation())) { diff --git a/chrome_elf/chrome_elf_util.cc b/chrome_elf/chrome_elf_util.cc index 275271e..a547d0b 100644 --- a/chrome_elf/chrome_elf_util.cc +++ b/chrome_elf/chrome_elf_util.cc @@ -4,14 +4,11 @@ #include "chrome_elf/chrome_elf_util.h" -#include <assert.h> #include <windows.h> #include "base/macros.h" #include "base/strings/string16.h" -ProcessType g_process_type = ProcessType::UNINITIALIZED; - namespace { const wchar_t kRegPathClientState[] = L"Software\\Google\\Update\\ClientState"; @@ -195,27 +192,18 @@ bool ReportingIsEnforcedByPolicy(bool* breakpad_enabled) { return false; } -void InitializeProcessType() { - assert(g_process_type == UNINITIALIZED); +bool IsNonBrowserProcess() { typedef bool (*IsSandboxedProcessFunc)(); IsSandboxedProcessFunc is_sandboxed_process_func = reinterpret_cast<IsSandboxedProcessFunc>( GetProcAddress(GetModuleHandle(NULL), "IsSandboxedProcess")); - if (is_sandboxed_process_func && is_sandboxed_process_func()) { - g_process_type = NON_BROWSER_PROCESS; - return; - } + bool is_sandboxed_process = + is_sandboxed_process_func && is_sandboxed_process_func(); - const wchar_t* command_line = GetCommandLine(); - if (command_line && wcsstr(command_line, L"--type")) { - g_process_type = NON_BROWSER_PROCESS; - return; - } + // TODO(robertshield): Drop the command line check when we drop support for + // enabling chrome_elf in unsandboxed processes. + wchar_t* command_line = GetCommandLine(); + bool has_process_type_flag = command_line && wcsstr(command_line, L"--type"); - g_process_type = BROWSER_PROCESS; -} - -bool IsNonBrowserProcess() { - assert(g_process_type != UNINITIALIZED); - return g_process_type == NON_BROWSER_PROCESS; + return (has_process_type_flag || is_sandboxed_process); } diff --git a/chrome_elf/chrome_elf_util.h b/chrome_elf/chrome_elf_util.h index 7e4cd0c..e87dc7f 100644 --- a/chrome_elf/chrome_elf_util.h +++ b/chrome_elf/chrome_elf_util.h @@ -7,12 +7,6 @@ #include "base/strings/string16.h" -enum ProcessType { - UNINITIALIZED, - NON_BROWSER_PROCESS, - BROWSER_PROCESS, -}; - // Returns true if |exe_path| points to a Chrome installed in an SxS // installation. bool IsCanary(const wchar_t* exe_path); @@ -30,14 +24,8 @@ bool AreUsageStatsEnabled(const wchar_t* exe_path); // if stats collecting is permitted by this policy and false if not. bool ReportingIsEnforcedByPolicy(bool* breakpad_enabled); -// Initializes |g_process_type| which stores whether or not the current process -// is the main browser process. -void InitializeProcessType(); - // Returns true if invoked in a Chrome process other than the main browser // process. False otherwise. bool IsNonBrowserProcess(); -extern ProcessType g_process_type; - #endif // CHROME_ELF_CHROME_ELF_UTIL_H_ diff --git a/chrome_elf/chrome_elf_util_unittest.cc b/chrome_elf/chrome_elf_util_unittest.cc index 979a49a..ad83801 100644 --- a/chrome_elf/chrome_elf_util_unittest.cc +++ b/chrome_elf/chrome_elf_util_unittest.cc @@ -48,12 +48,6 @@ TEST(ChromeElfUtilTest, SystemInstallTest) { EXPECT_FALSE(IsSystemInstall(kChromeUserExePath)); } -TEST(ChromeElfUtilTest, BrowserProcessTest) { - EXPECT_TRUE(g_process_type == ProcessType::UNINITIALIZED); - InitializeProcessType(); - EXPECT_FALSE(IsNonBrowserProcess()); -} - // Parameterized test with paramters: // 1: product: "canary" or "google" // 2: install level: "user" or "system" |