Revert "ScopedCrashKey doesn't appear to be configured to work on Windows. Manually set the crash k…

chrome/app/kasko_client.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.
 
 #if defined(KASKO)
 
 #include "chrome/app/kasko_client.h"
 
 #include <windows.h>
 
 #include <string>
 
+#include "base/debug/crash_logging.h"
 #include "base/guid.h"
 #include "base/logging.h"
 #include "base/process/process_handle.h"
-#include "base/strings/utf_string_conversions.h"
 #include "base/win/wrapped_window_proc.h"
 #include "breakpad/src/client/windows/common/ipc_protocol.h"
 #include "chrome/app/chrome_watcher_client_win.h"
 #include "chrome/chrome_watcher/chrome_watcher_main_api.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/crash_keys.h"
 #include "components/crash/app/crash_keys_win.h"
 #include "syzygy/kasko/api/client.h"
 
 namespace {
@@ skipping 27 matching lines @@
                 "CrashKey and CustomInfoEntry structs are not compatible.");
   static_assert(
       sizeof(reinterpret_cast<kasko::api::CrashKey*>(0)->name) ==
           sizeof(reinterpret_cast<google_breakpad::CustomInfoEntry*>(0)->name),
       "CrashKey and CustomInfoEntry structs are not compatible.");
   static_assert(
       sizeof(reinterpret_cast<kasko::api::CrashKey*>(0)->value) ==
           sizeof(reinterpret_cast<google_breakpad::CustomInfoEntry*>(0)->value),
       "CrashKey and CustomInfoEntry structs are not compatible.");
 
-  breakpad::CrashKeysWin* keeper = breakpad::CrashKeysWin::keeper();
-  if (!keeper)
-    return;
-
   // Assign a GUID that can be used to correlate the Kasko report to the
   // Breakpad report, to verify data consistency.
   std::string guid = base::GenerateGUID();
   {
-    keeper->SetCrashKeyValue(base::ASCIIToUTF16(crash_keys::kKaskoGuid).c_str(),
-                             base::ASCIIToUTF16(guid).c_str());
-
     base::debug::ScopedCrashKey kasko_guid(crash_keys::kKaskoGuid, guid);
-    size_t crash_key_count = keeper->custom_info_entries().size();
+    size_t crash_key_count =
+        breakpad::CrashKeysWin::keeper()->custom_info_entries().size();
     const kasko::api::CrashKey* crash_keys =
         reinterpret_cast<const kasko::api::CrashKey*>(
-            keeper->custom_info_entries().data());
+            breakpad::CrashKeysWin::keeper()->custom_info_entries().data());
 
     if (g_chrome_watcher_client &&
         g_chrome_watcher_client->EnsureInitialized()) {
       kasko::api::SendReport(info, protobuf, protobuf_length, crash_keys,
                              crash_key_count);
     }
-
-    keeper->ClearCrashKeyValue(
-        base::ASCIIToUTF16(crash_keys::kKaskoGuid).c_str());
   }
 
   {
-    keeper->SetCrashKeyValue(
-        base::ASCIIToUTF16(crash_keys::kKaskoEquivalentGuid).c_str(),
-        base::ASCIIToUTF16(guid).c_str());
+    base::debug::ScopedCrashKey kasko_equivalent_guid(
+        crash_keys::kKaskoEquivalentGuid, guid);
     // While Kasko remains experimental, also report via Breakpad.
     base::win::WinProcExceptionFilter crash_for_exception =
         reinterpret_cast<base::win::WinProcExceptionFilter>(::GetProcAddress(
             ::GetModuleHandle(chrome::kBrowserProcessExecutableName),
             "CrashForException"));
     crash_for_exception(info);
-    keeper->ClearCrashKeyValue(
-        base::ASCIIToUTF16(crash_keys::kKaskoEquivalentGuid).c_str());
   }
 }
 
 #endif  // defined(KASKO)