crash_keys: Convert keys in //components/discardable_memory to the new API.

Bug: 598854
Change-Id: I4a8aef73b405d4e4f1c557a9eaad2c3fb02c8f24
Reviewed-on: https://chromium-review.googlesource.com/823943Reviewed-by: David Reveman <reveman@chromium.org>
Commit-Queue: Robert Sesek <rsesek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#523782}

android_webview/common/crash_reporter/crash_keys.cc

@@ -37,10 +37,6 @@ size_t RegisterWebViewCrashKeys() {
       {kShutdownType, kSmallSize},
       {kBrowserUnpinTrace, kMediumSize},
 
-      // content/:
-      {"discardable-memory-allocated", kSmallSize},
-      {"discardable-memory-free", kSmallSize},
-      {"total-discardable-memory-allocated", kSmallSize},
       {kViewCount, kSmallSize},
 
       // media/:

chrome/app/chrome_crash_reporter_client_win.cc

@@ -83,10 +83,6 @@ size_t RegisterCrashKeysHelper() {
       {kShutdownType, kSmallSize},
       {kBrowserUnpinTrace, kMediumSize},
 
-      // content/:
-      {"discardable-memory-allocated", kSmallSize},
-      {"discardable-memory-free", kSmallSize},
-      {"total-discardable-memory-allocated", kSmallSize},
       {kViewCount, kSmallSize},
 
       // media/:

chrome/common/crash_keys.cc

@@ -63,10 +63,6 @@ size_t RegisterChromeCrashKeys() {
     {kShutdownType, kSmallSize},
     {kBrowserUnpinTrace, kMediumSize},
 
-    // content/:
-    {"discardable-memory-allocated", kSmallSize},
-    {"discardable-memory-free", kSmallSize},
-    {"total-discardable-memory-allocated", kSmallSize},
     {kViewCount, kSmallSize},
 
     // sandbox/:

chromecast/crash/cast_crash_keys.cc

@@ -32,10 +32,6 @@ size_t RegisterCastCrashKeys() {
       {"shutdown-type", ::crash_keys::kSmallSize},
       {"browser-unpin-trace", ::crash_keys::kMediumSize},
 
-      // content/:
-      {"discardable-memory-allocated", ::crash_keys::kSmallSize},
-      {"discardable-memory-free", ::crash_keys::kSmallSize},
-      {"total-discardable-memory-allocated", ::crash_keys::kSmallSize},
       {"view-count", ::crash_keys::kSmallSize},
 
       // media/:

components/discardable_memory/DEPS

 include_rules = [
+  "+components/crash/core/common/crash_key.h",
   "+mojo/public/cpp",
 ]

components/discardable_memory/client/BUILD.gn

@@ -16,6 +16,7 @@ component("client") {
 
   deps = [
     "//base",
+    "//components/crash/core/common:crash_key",
     "//components/discardable_memory/common",
     "//components/discardable_memory/public/interfaces",
   ]

components/discardable_memory/client/client_discardable_shared_memory_manager.cc

@@ -11,7 +11,6 @@
 
 #include "base/atomic_sequence_num.h"
 #include "base/bind.h"
-#include "base/debug/crash_logging.h"
 #include "base/macros.h"
 #include "base/memory/discardable_memory.h"
 #include "base/memory/discardable_shared_memory.h"
@@ -25,6 +24,7 @@
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/trace_event/memory_dump_manager.h"
 #include "base/trace_event/trace_event.h"
+#include "components/crash/core/common/crash_key.h"
 #include "mojo/public/cpp/system/platform_handle.h"
 
 namespace discardable_memory {
@@ -410,14 +410,13 @@ void ClientDiscardableSharedMemoryManager::DeletedDiscardableSharedMemory(
 void ClientDiscardableSharedMemoryManager::MemoryUsageChanged(
     size_t new_bytes_total,
     size_t new_bytes_free) const {
-  static const char kDiscardableMemoryAllocatedKey[] =
-      "discardable-memory-allocated";
-  base::debug::SetCrashKeyValue(kDiscardableMemoryAllocatedKey,
-                                base::NumberToString(new_bytes_total));
-
-  static const char kDiscardableMemoryFreeKey[] = "discardable-memory-free";
-  base::debug::SetCrashKeyValue(kDiscardableMemoryFreeKey,
-                                base::NumberToString(new_bytes_free));
+  static crash_reporter::CrashKeyString<24> discardable_memory_allocated(
+      "discardable-memory-allocated");
+  discardable_memory_allocated.Set(base::NumberToString(new_bytes_total));
+
+  static crash_reporter::CrashKeyString<24> discardable_memory_free(
+      "discardable-memory-free");
+  discardable_memory_free.Set(base::NumberToString(new_bytes_free));
 }
 
 }  // namespace discardable_memory

components/discardable_memory/service/BUILD.gn

@@ -16,6 +16,7 @@ component("service") {
 
   deps = [
     "//base",
+    "//components/crash/core/common:crash_key",
     "//components/discardable_memory/common",
     "//components/discardable_memory/public/interfaces",
   ]

components/discardable_memory/service/discardable_shared_memory_manager.cc

@@ -12,7 +12,6 @@
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
-#include "base/debug/crash_logging.h"
 #include "base/macros.h"
 #include "base/memory/discardable_memory.h"
 #include "base/memory/memory_coordinator_client_registry.h"
@@ -29,6 +28,7 @@
 #include "base/trace_event/process_memory_dump.h"
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
+#include "components/crash/core/common/crash_key.h"
 #include "components/discardable_memory/common/discardable_shared_memory_heap.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/public/cpp/system/platform_handle.h"
@@ -617,10 +617,9 @@ void DiscardableSharedMemoryManager::ReleaseMemory(
 
 void DiscardableSharedMemoryManager::BytesAllocatedChanged(
     size_t new_bytes_allocated) const {
-  static const char kTotalDiscardableMemoryAllocatedKey[] =
-      "total-discardable-memory-allocated";
-  base::debug::SetCrashKeyValue(kTotalDiscardableMemoryAllocatedKey,
-                                base::NumberToString(new_bytes_allocated));
+  static crash_reporter::CrashKeyString<24> total_discardable_memory(
+      "total-discardable-memory-allocated");
+  total_discardable_memory.Set(base::NumberToString(new_bytes_allocated));
 }
 
 base::Time DiscardableSharedMemoryManager::Now() const {