Report crash count UMAs for utility process on Android

Bug: 872343
Change-Id: Icb7aef94a64039b45f2284fc9ff9fe2dba33296e
Reviewed-on: https://chromium-review.googlesource.com/c/1284062Reviewed-by: Robert Sesek <rsesek@chromium.org>
Reviewed-by: Bo <boliu@chromium.org>
Commit-Queue: Clark DuVall <cduvall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#600113}

components/crash/content/browser/crash_metrics_reporter_android.cc

@@ -147,9 +147,14 @@ void CrashMetricsReporter::CrashDumpProcessed(
   const uint64_t vm_size_kb = info.blink_oom_metrics.current_vm_size_kb;
   const uint64_t blink_usage_kb = info.blink_oom_metrics.current_blink_usage_kb;
 
-  if (info.process_type == content::PROCESS_TYPE_GPU && app_foreground &&
-      android_oom_kill) {
-    ReportCrashCount(ProcessedCrashCounts::kGpuForegroundOom, &reported_counts);
+  if (app_foreground && android_oom_kill) {
+    if (info.process_type == content::PROCESS_TYPE_GPU) {
+      ReportCrashCount(ProcessedCrashCounts::kGpuForegroundOom,
+                       &reported_counts);
+    } else if (info.process_type == content::PROCESS_TYPE_UTILITY) {
+      ReportCrashCount(ProcessedCrashCounts::kUtilityForegroundOom,
+                       &reported_counts);
+    }
   }
 
   if (info.process_type == content::PROCESS_TYPE_RENDERER &&
@@ -263,10 +268,15 @@ void CrashMetricsReporter::CrashDumpProcessed(
   }
 
   if (has_valid_dump) {
-    ReportCrashCount(info.process_type == content::PROCESS_TYPE_GPU
-                         ? ProcessedCrashCounts::kGpuCrashAll
-                         : ProcessedCrashCounts::kRendererCrashAll,
-                     &reported_counts);
+    if (info.process_type == content::PROCESS_TYPE_RENDERER) {
+      ReportCrashCount(ProcessedCrashCounts::kRendererCrashAll,
+                       &reported_counts);
+    } else if (info.process_type == content::PROCESS_TYPE_GPU) {
+      ReportCrashCount(ProcessedCrashCounts::kGpuCrashAll, &reported_counts);
+    } else if (info.process_type == content::PROCESS_TYPE_UTILITY) {
+      ReportCrashCount(ProcessedCrashCounts::kUtilityCrashAll,
+                       &reported_counts);
+    }
   }
 
   if (app_foreground && android_oom_kill &&

components/crash/content/browser/crash_metrics_reporter_android.h

@@ -49,7 +49,9 @@ class CrashMetricsReporter {
     kRendererForegroundInvisibleWithModerateBindingOom = 14,
     kRendererForegroundVisibleAllocationFailure = 15,
     kRendererAllocationFailureAll = 16,
-    kMaxValue = kRendererAllocationFailureAll
+    kUtilityForegroundOom = 17,
+    kUtilityCrashAll = 18,
+    kMaxValue = kUtilityCrashAll
   };
   using ReportedCrashTypeSet = base::flat_set<ProcessedCrashCounts>;
 

components/crash/content/browser/crash_metrics_reporter_android_unittest.cc

@@ -138,6 +138,51 @@ TEST_F(CrashMetricsReporterTest, GpuProcessOOM) {
       "GPU.GPUProcessDetailedExitStatus");
 }
 
+TEST_F(CrashMetricsReporterTest, UtilityProcessOOM) {
+  ChildExitObserver::TerminationInfo termination_info;
+  termination_info.process_host_id = 1;
+  termination_info.pid = base::kNullProcessHandle;
+  termination_info.process_type = content::PROCESS_TYPE_UTILITY;
+  termination_info.app_state =
+      base::android::APPLICATION_STATE_HAS_RUNNING_ACTIVITIES;
+  termination_info.normal_termination = false;
+  termination_info.binding_state = base::android::ChildBindingState::STRONG;
+  termination_info.was_killed_intentionally_by_browser = false;
+  termination_info.was_oom_protected_status = true;
+  termination_info.renderer_has_visible_clients = true;
+
+  TestOomCrashProcessing(
+      termination_info,
+      {CrashMetricsReporter::ProcessedCrashCounts::kUtilityForegroundOom},
+      nullptr);
+}
+
+TEST_F(CrashMetricsReporterTest, UtilityProcessAll) {
+  ChildExitObserver::TerminationInfo termination_info;
+  termination_info.process_host_id = 1;
+  termination_info.pid = base::kNullProcessHandle;
+  termination_info.process_type = content::PROCESS_TYPE_UTILITY;
+  termination_info.app_state =
+      base::android::APPLICATION_STATE_HAS_RUNNING_ACTIVITIES;
+  termination_info.normal_termination = false;
+  termination_info.binding_state = base::android::ChildBindingState::STRONG;
+  termination_info.was_killed_intentionally_by_browser = false;
+  termination_info.was_oom_protected_status = true;
+  termination_info.renderer_has_visible_clients = true;
+
+  CrashMetricsReporterObserver crash_dump_observer;
+  CrashMetricsReporter::GetInstance()->AddObserver(&crash_dump_observer);
+
+  CrashMetricsReporter::GetInstance()->CrashDumpProcessed(
+      termination_info,
+      breakpad::CrashDumpManager::CrashDumpStatus::kValidDump);
+  crash_dump_observer.WaitForProcessed();
+
+  EXPECT_EQ(CrashMetricsReporter::ReportedCrashTypeSet(
+                {CrashMetricsReporter::ProcessedCrashCounts::kUtilityCrashAll}),
+            crash_dump_observer.recorded_crash_types());
+}
+
 TEST_F(CrashMetricsReporterTest, RendererSubframeOOM) {
   ChildExitObserver::TerminationInfo termination_info;
   termination_info.process_host_id = 1;

tools/metrics/histograms/enums.xml

@@ -1114,6 +1114,8 @@ uploading your change for review.  These are checked by presubmit scripts.
   <int value="15"
       label="Visible renderer in foreground app allocation failure"/>
   <int value="16" label="All renderer allocation failure"/>
+  <int value="17" label="Utility process foreground OOM"/>
+  <int value="18" label="All utility process crashes"/>
 </enum>
 
 <enum name="AndroidResourceExtractionStatus">