Re-enable UkmBrowserTest.HistoryDeleteCheck on non-Android.

It was disabled for all platforms even though it was flaky only on Android.

Bug: 1131541
Change-Id: Ia8588057199e10de0d2c70d02729cdc00df49133
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2575764
Auto-Submit: Alexei Svitkine <asvitkine@chromium.org>
Commit-Queue: Alexei Svitkine <asvitkine@chromium.org>
Commit-Queue: Caitlin Fischer <caitlinfischer@google.com>
Commit-Queue: Robert Kaplow <rkaplow@chromium.org>
Reviewed-by: Caitlin Fischer <caitlinfischer@google.com>
Reviewed-by: Robert Kaplow <rkaplow@chromium.org>
Cr-Commit-Position: refs/heads/master@{#834316}

chrome/browser/metrics/ukm_browsertest.cc

@@ -1096,8 +1096,13 @@ IN_PROC_BROWSER_TEST_F(UkmBrowserTest, MetricsReportingCheck) {
 // Make sure that pending data is deleted when user deletes history.
 // Keep in sync with testHistoryDelete in ios/chrome/browser/metrics/
 // ukm_egtest.mm.
-// Quite flaky: https://crbug.com/1131541
-IN_PROC_BROWSER_TEST_F(UkmBrowserTest, DISABLED_HistoryDeleteCheck) {
+// Quite flaky on Android: https://crbug.com/1131541
+#if defined(OS_ANDROID)
+#define MAYBE_HistoryDeleteCheck DISABLED_HistoryDeleteCheck
+#else
+#define MAYBE_HistoryDeleteCheck HistoryDeleteCheck
+#endif
+IN_PROC_BROWSER_TEST_F(UkmBrowserTest, MAYBE_HistoryDeleteCheck) {
   ukm::UkmTestHelper ukm_test_helper(GetUkmService());
   MetricsConsentOverride metrics_consent(true);