Revert of Call RegisterCrashKeys for chrome.exe in static build.

chrome/app/chrome_crash_reporter_client.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/app/chrome_crash_reporter_client.h"
 
 #include "base/atomicops.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/files/file_path.h"
@@ skipping 303 matching lines @@
   if (env->GetVar("BREAKPAD_DUMP_LOCATION", &alternate_crash_dump_location)) {
     base::FilePath crash_dumps_dir_path =
         base::FilePath::FromUTF8Unsafe(alternate_crash_dump_location);
     PathService::Override(chrome::DIR_CRASH_DUMPS, crash_dumps_dir_path);
   }
 
   return PathService::Get(chrome::DIR_CRASH_DUMPS, crash_dir);
 }
 
 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() {
   scoped_ptr<base::Environment> env(base::Environment::Create());
   return env->HasVar(env_vars::kHeadless);
 }
 
 bool ChromeCrashReporterClient::GetCollectStatsConsent() {
 #if defined(GOOGLE_CHROME_BUILD)
   bool is_official_chrome_build = true;
@@ skipping 31 matching lines @@
 bool ChromeCrashReporterClient::EnableBreakpadForProcess(
     const std::string& process_type) {
   return process_type == switches::kRendererProcess ||
          process_type == switches::kPluginProcess ||
          process_type == switches::kPpapiPluginProcess ||
          process_type == switches::kZygoteProcess ||
          process_type == switches::kGpuProcess;
 }
 
 }  // namespace chrome