win: Fix not setting crash keys in non-component build

components/crash/content/app/crashpad.cc

 // Copyright 2015 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 "components/crash/content/app/crashpad.h"
 
 #include <string.h>
 
 #include <algorithm>
 #include <map>
 #include <vector>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/debug/crash_logging.h"
 #include "base/debug/dump_without_crashing.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "components/crash/content/app/crash_reporter_client.h"
 #include "third_party/crashpad/crashpad/client/crash_report_database.h"
 #include "third_party/crashpad/crashpad/client/crashpad_client.h"
 #include "third_party/crashpad/crashpad/client/crashpad_info.h"
 #include "third_party/crashpad/crashpad/client/settings.h"
 #include "third_party/crashpad/crashpad/client/simple_string_dictionary.h"
 #include "third_party/crashpad/crashpad/client/simulate_crash.h"
 
 #if defined(OS_POSIX)
@@ skipping 104 matching lines @@
   // time to chew on symbols.
   if (!browser_process || is_debug_build) {
     crashpad_info->set_system_crash_reporter_forwarding(
         crashpad::TriState::kDisabled);
   }
 #endif  // OS_MACOSX
 
   g_simple_string_dictionary = new crashpad::SimpleStringDictionary();
   crashpad_info->set_simple_annotations(g_simple_string_dictionary);
 
+#if !defined(OS_WIN) || !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(SetCrashKeyValue, ClearCrashKey);
   crash_reporter_client->RegisterCrashKeys();
+#endif
 
   SetCrashKeyValue("ptype", browser_process ? base::StringPiece("browser")
                                             : base::StringPiece(process_type));
 #if defined(OS_POSIX)
   SetCrashKeyValue("pid", base::IntToString(getpid()));
 #elif defined(OS_WIN)
   SetCrashKeyValue("pid", base::IntToString(::GetCurrentProcessId()));
 #endif
 
   logging::SetLogMessageHandler(LogMessageHandler);
@@ skipping 69 matching lines @@
     }
   }
 
   std::sort(uploaded_reports->begin(), uploaded_reports->end(),
             [](const UploadedReport& a, const UploadedReport& b) {
               return a.creation_time >= b.creation_time;
             });
 }
 
 }  // namespace crash_reporter
+
+#if defined(OS_WIN)
+
+extern "C" {
+
+// NOTE: This function is used by SyzyASAN to annotate crash reports. If you
+// change the name or signature of this function you will break SyzyASAN
+// instrumented releases of Chrome. Please contact syzygy-team@chromium.org
+// before doing so! See also http://crbug.com/567781.
+void __declspec(dllexport) __cdecl SetCrashKeyValueImpl(const wchar_t* key,
+                                                        const wchar_t* value) {

[scottmg, 2015/12/10 01:11:29]

These also happen to be functions that SyzyASAN relies on existing.

+  crash_reporter::SetCrashKeyValue(base::UTF16ToUTF8(key),
+                                   base::UTF16ToUTF8(value));
+}
+
+void __declspec(dllexport) __cdecl ClearCrashKeyValueImpl(const wchar_t* key) {
+  crash_reporter::ClearCrashKey(base::UTF16ToUTF8(key));
+}
+
+}  // extern "C"
+
+#endif  // OS_WIN