Change DumpProcessWithoutCrash to use load-time dynamic linking

chrome/app/chrome_main.cc

Index: chrome/app/chrome_main.cc
diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc
index aec129c9bd1b72991d0c4e482c2c41e3e91b47e5..117c4085351f22d3267ca28a21c7e3c3484133d9 100644
--- a/chrome/app/chrome_main.cc
+++ b/chrome/app/chrome_main.cc
@@ -29,6 +29,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)
 
@@ -69,15 +70,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(GetDumpWithoutCrashingFunction());

[Will Harris, 2017/05/26 05:54:38]

I'm not sure it's okay to call this function in chrome_elf.dll from chrome.dll -
it seems to work though, but needs investigation.

[Will Harris, 2017/05/26 06:03:34]

so fwiw current chrome.dll already calls these functions from chrome_elf.dll so
I presume adding another one does no harm.

GetBlacklistIndex
GetInstallDetailsPayload
IsBlacklistInitialized
SuccessfullyBlocked

 
   // Verify that chrome_elf and this module (chrome.dll and chrome_child.dll)
   // have the same version.