crash_keys: Convert "num-users" to the new API.

Bug: 598854
Change-Id: Icb9b7586a8b14772dded0b4c1c323a3668dba371
Reviewed-on: https://chromium-review.googlesource.com/804350Reviewed-by: Alexander Alekseev <alemate@chromium.org>
Commit-Queue: Robert Sesek <rsesek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#522075}

chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc

@@ -23,8 +23,8 @@
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/single_thread_task_runner.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
-#include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/sys_info.h"
 #include "base/task_runner.h"
@@ -65,7 +65,6 @@
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/crash_keys.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/cryptohome/async_method_caller.h"
@@ -73,6 +72,7 @@
 #include "chromeos/settings/cros_settings_names.h"
 #include "chromeos/timezone/timezone_resolver.h"
 #include "components/arc/arc_util.h"
+#include "components/crash/core/common/crash_key.h"
 #include "components/policy/policy_constants.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
@@ -1287,9 +1287,8 @@ void ChromeUserManagerImpl::UpdateNumberOfUsers() {
       ash::MultiProfileUMA::RecordUserCount(users);
   }
 
-  base::debug::SetCrashKeyValue(
-      crash_keys::kNumberOfUsers,
-      base::StringPrintf("%" PRIuS, GetLoggedInUsers().size()));
+  static crash_reporter::CrashKeyString<64> crash_key("num-users");
+  crash_key.Set(base::NumberToString(GetLoggedInUsers().size()));
 }
 
 void ChromeUserManagerImpl::UpdateUserTimeZoneRefresher(Profile* profile) {

chrome/common/crash_keys.cc

@@ -54,10 +54,6 @@ const char kInputEventFilterSendFailure[] = "input-event-filter-send-failure";
 
 const char kPrinterInfo[] = "prn-info-%" PRIuS;
 
-#if defined(OS_CHROMEOS)
-const char kNumberOfUsers[] = "num-users";
-#endif
-
 const char kViewCount[] = "view-count";
 
 const char kUserCloudPolicyManagerConnectTrace[] =
@@ -123,9 +119,6 @@ size_t RegisterChromeCrashKeys() {
     {kIsEnterpriseManaged, kSmallSize},
 #endif
     {kInputEventFilterSendFailure, kSmallSize},
-#if defined(OS_CHROMEOS)
-    {kNumberOfUsers, kSmallSize},
-#endif
 #if defined(OS_MACOSX)
     // content/:
     {"text-input-context-client", kMediumSize},

chrome/common/crash_keys.h

@@ -100,11 +100,6 @@ extern const char kInputEventFilterSendFailure[];
 const size_t kPrinterInfoCount = 4;
 extern const char kPrinterInfo[];
 
-#if defined(OS_CHROMEOS)
-// The number of simultaneous users in multi profile sessions.
-extern const char kNumberOfUsers[];
-#endif
-
 // Numbers of active views.
 extern const char kViewCount[];