Integrate Crashpad UMA

third_party/crashpad/crashpad/handler/handler_main.cc

Index: third_party/crashpad/crashpad/handler/handler_main.cc
diff --git a/third_party/crashpad/crashpad/handler/handler_main.cc b/third_party/crashpad/crashpad/handler/handler_main.cc
index 3240cd38b37d79d6c915560aa41f325702cf00cd..28fe971d47bb0ea4cbb54be84c6d14633692e767 100644
--- a/third_party/crashpad/crashpad/handler/handler_main.cc
+++ b/third_party/crashpad/crashpad/handler/handler_main.cc
@@ -27,6 +27,7 @@
 #include "base/files/file_path.h"
 #include "base/files/scoped_file.h"
 #include "base/logging.h"
+#include "base/metrics/persistent_metrics_file_util.h"
 #include "base/scoped_generic.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
@@ -78,6 +79,7 @@ void Usage(const base::FilePath& me) {
 "      --handshake-handle=HANDLE\n"
 "                              create a new pipe and send its name via HANDLE\n"
 #endif  // OS_MACOSX
+"      --metrics=PATH          store metrics files at PATH (only in Chromium)\n"
 "      --no-rate-limit         don't rate limit crash uploads\n"
 #if defined(OS_MACOSX)
 "      --reset-own-crash-exception-port-to-system-default\n"
@@ -136,6 +138,7 @@ int HandlerMain(int argc, char* argv[]) {
 #elif defined(OS_WIN)
     kOptionHandshakeHandle,
 #endif  // OS_MACOSX
+    kOptionMetrics,
     kOptionNoRateLimit,
 #if defined(OS_MACOSX)
     kOptionResetOwnCrashExceptionPortToSystemDefault,
@@ -153,6 +156,7 @@ int HandlerMain(int argc, char* argv[]) {
     std::map<std::string, std::string> annotations;
     std::string url;
     const char* database;
+    const char* metrics;
 #if defined(OS_MACOSX)
     int handshake_fd;
     std::string mach_service;
@@ -179,6 +183,7 @@ int HandlerMain(int argc, char* argv[]) {
 #elif defined(OS_WIN)
       {"handshake-handle", required_argument, nullptr, kOptionHandshakeHandle},
 #endif  // OS_MACOSX
+      {"metrics", required_argument, nullptr, kOptionMetrics},
       {"no-rate-limit", no_argument, nullptr, kOptionNoRateLimit},
 #if defined(OS_MACOSX)
       {"reset-own-crash-exception-port-to-system-default",
@@ -243,6 +248,10 @@ int HandlerMain(int argc, char* argv[]) {
         break;
       }
 #endif  // OS_MACOSX
+      case kOptionMetrics: {
+        options.metrics = optarg;
+        break;
+      }
       case kOptionNoRateLimit: {
         options.rate_limit = false;
         break;
@@ -313,6 +322,14 @@ int HandlerMain(int argc, char* argv[]) {
     return EXIT_FAILURE;
   }
 
+  if (options.metrics) {
+    const base::FilePath metrics_dir(
+        ToolSupport::CommandLineArgumentToFilePathStringType(options.metrics));
+    const char kMetricsName[] = "CrashpadMetrics";
+    base::InitializeGlobalPersistentMetricsStorage(
+        metrics_dir, kMetricsName, 1 << 20);
+  }
+
 #if defined(OS_MACOSX)
   if (options.mach_service.empty()) {
     // Don’t do this when being run by launchd. See launchd.plist(5).
@@ -412,6 +429,8 @@ int HandlerMain(int argc, char* argv[]) {
   upload_thread.Stop();
   prune_thread.Stop();
 
+  base::CleanUpGlobalPersistentHistogramStorage();
+
   return EXIT_SUCCESS;
 }