Revert of Call RegisterCrashKeys for chrome.exe in static build. (patchset #5...

Revert of Call RegisterCrashKeys for chrome.exe in static build. (patchset #5 id:140001 of https://codereview.chromium.org/1008523002/)

Reason for revert:
Test failures.

Original issue's description:
> Call RegisterCrashKeys for chrome.exe in static build.
>
> In component builds the single invocation from child_process_logging_win is sufficient (as there is only a single copy of base).
>
> BUG=460512
>
> Committed: https://crrev.com/0bfeabec41ac37bc9e8c0b62316a11269db156e5
> Cr-Commit-Position: refs/heads/master@{#320967}

TBR=rsesek@chromium.org,grt@chromium.org,kbr@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=460512

Review URL: https://codereview.chromium.org/1016933002

Cr-Commit-Position: refs/heads/master@{#320994}

chrome/app/chrome_crash_reporter_client.cc

@@ -321,17 +321,10 @@ bool ChromeCrashReporterClient::GetCrashDumpLocation(
 }
 
 size_t ChromeCrashReporterClient::RegisterCrashKeys() {
-  // Note: On Windows this only affects the EXE. A separate invocation from
-  // child_process_logging_win.cc registers crash keys for Chrome.dll.
-#if defined(COMPONENT_BUILD)
-  // On Windows, this is not called in a component build, as in that case a
-  // single copy of 'base' is shared by the EXE and the various DLLs, and that
-  // copy is configured by child_process_logging_win.cc.
-  NOTREACHED();
-  return 0;
-#else
+  // Note: This is not called on Windows because Breakpad is initialized in the
+  // EXE module, but code that uses crash keys is in the DLL module.
+  // RegisterChromeCrashKeys() will be called after the DLL is loaded.
   return crash_keys::RegisterChromeCrashKeys();
-#endif
 }
 
 bool ChromeCrashReporterClient::IsRunningUnattended() {

components/crash/app/breakpad_win.cc

@@ -541,16 +541,8 @@ void InitCrashReporter(const std::string& process_type_switch) {
                             base::CommandLine::ForCurrentProcess(),
                             GetCrashReporterClient());
 
-#if !defined(COMPONENT_BUILD)
-  // chrome/common/child_process_logging_win.cc registers crash keys for
-  // chrome.dll. In a component build, that is sufficient as chrome.dll and
-  // chrome.exe share a copy of base (in base.dll).
-  // In a static build, the EXE must separately initialize the crash keys
-  // configuration as it has its own statically linked copy of base.
   base::debug::SetCrashKeyReportingFunctions(&SetCrashKeyValueForBaseDebug,
                                              &ClearCrashKeyForBaseDebug);
-  GetCrashReporterClient()->RegisterCrashKeys();
-#endif
 
   google_breakpad::ExceptionHandler::MinidumpCallback callback = NULL;
   LPTOP_LEVEL_EXCEPTION_FILTER default_filter = NULL;