crash_keys: Convert keys in //android_webview to the new API.

Bug: 598854
Change-Id: I0f2ad410d87e27bac5686091b31fbbab311acf14
Reviewed-on: https://chromium-review.googlesource.com/820855Reviewed-by: Tobias Sargeant <tobiasjs@chromium.org>
Commit-Queue: Robert Sesek <rsesek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#523508}

android_webview/common/crash_reporter/crash_keys.cc

@@ -38,9 +38,6 @@ size_t RegisterWebViewCrashKeys() {
       {kVariations, kHugeSize},
       {kShutdownType, kSmallSize},
       {kBrowserUnpinTrace, kMediumSize},
-      {kAppPackageName, kSmallSize},
-      {kAppPackageVersionCode, kSmallSize},
-      {kAndroidSdkInt, kSmallSize},
 
       // content/:
       {"discardable-memory-allocated", kSmallSize},

android_webview/lib/aw_main_delegate.cc

@@ -23,7 +23,6 @@
 #include "base/android/build_info.h"
 #include "base/command_line.h"
 #include "base/cpu.h"
-#include "base/debug/crash_logging.h"
 #include "base/i18n/icu_util.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
@@ -31,6 +30,7 @@
 #include "base/threading/thread_restrictions.h"
 #include "cc/base/switches.h"
 #include "components/crash/content/app/breakpad_linux.h"
+#include "components/crash/core/common/crash_key.h"
 #include "components/safe_browsing/android/safe_browsing_api_handler_bridge.h"
 #include "components/spellcheck/common/spellcheck_features.h"
 #include "content/public/browser/android/browser_media_player_manager_register.h"
@@ -210,13 +210,18 @@ void AwMainDelegate::PreSandboxStartup() {
 
   base::android::BuildInfo* android_build_info =
       base::android::BuildInfo::GetInstance();
-  base::debug::SetCrashKeyValue(crash_keys::kAppPackageName,
-                                android_build_info->package_name());
-  base::debug::SetCrashKeyValue(crash_keys::kAppPackageVersionCode,
-                                android_build_info->package_version_code());
-  base::debug::SetCrashKeyValue(
-      crash_keys::kAndroidSdkInt,
-      base::IntToString(android_build_info->sdk_int()));
+
+  static ::crash_reporter::CrashKeyString<64> app_name_key(
+      crash_keys::kAppPackageName);
+  app_name_key.Set(android_build_info->package_name());
+
+  static ::crash_reporter::CrashKeyString<64> app_version_key(
+      crash_keys::kAppPackageVersionCode);
+  app_version_key.Set(android_build_info->package_version_code());
+
+  static ::crash_reporter::CrashKeyString<8> sdk_int_key(
+      crash_keys::kAndroidSdkInt);
+  sdk_int_key.Set(base::IntToString(android_build_info->sdk_int()));
 }
 
 int AwMainDelegate::RunProcess(