Index: chrome/app/chrome_main.cc |
diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc |
index 54524a637582253179bed17a895b563160ad0d17..b60fec88579faf52d44539c4d0883b6555e600ee 100644 |
--- a/chrome/app/chrome_main.cc |
+++ b/chrome/app/chrome_main.cc |
@@ -33,6 +33,7 @@ |
#include "chrome/common/chrome_constants.h" |
#include "chrome/install_static/initialize_from_primary_module.h" |
#include "chrome/install_static/install_details.h" |
+#include "chrome_elf/chrome_elf_main.h" |
#define DLLEXPORT __declspec(dllexport) |
@@ -73,15 +74,7 @@ int ChromeMain(int argc, const char** argv) { |
params.instance = instance; |
params.sandbox_info = sandbox_info; |
- // SetDumpWithoutCrashingFunction must be passed the DumpProcess function |
- // from chrome_elf and not from the DLL in order for DumpWithoutCrashing to |
- // function correctly. |
- typedef void (__cdecl *DumpProcessFunction)(); |
- DumpProcessFunction DumpProcess = reinterpret_cast<DumpProcessFunction>( |
- ::GetProcAddress(::GetModuleHandle(chrome::kChromeElfDllName), |
- "DumpProcessWithoutCrash")); |
- CHECK(DumpProcess); |
- base::debug::SetDumpWithoutCrashingFunction(DumpProcess); |
+ base::debug::SetDumpWithoutCrashingFunction(&DumpWithoutCrashing); |
// Verify that chrome_elf and this module (chrome.dll and chrome_child.dll) |
// have the same version. |