Mark BackgroundTracingManagerBrowserTest test flaky

content/browser/tracing/background_tracing_manager_browsertest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/macros.h"
@@ skipping 303 matching lines @@
       handle, base::Bind(&StartedFinalizingCallback, base::Closure(), true));
 
   wait_for_upload.Run();
 
   EXPECT_TRUE(upload_config_wrapper.get_receive_count() == 1);
   EXPECT_TRUE(upload_config_wrapper.TraceHasMatchingString("cpu-brand"));
   EXPECT_TRUE(upload_config_wrapper.TraceHasMatchingString("network-type"));
   EXPECT_TRUE(upload_config_wrapper.TraceHasMatchingString("user-agent"));
 }
 
+#if defined(OS_ANDROID)
+// Flaky on android: https://crbug.com/639706
+#define MAYBE_CrashWhenSubprocessWithoutArgumentFilter \
+        DISABLED_CrashWhenSubprocessWithoutArgumentFilter
+#else
+#define MAYBE_CrashWhenSubprocessWithoutArgumentFilter \
+        CrashWhenSubprocessWithoutArgumentFilter
+#endif
+
 // This tests subprocesses (like a navigating renderer) which gets told to
 // provide a argument-filtered trace and has no predicate in place to do the
 // filtering (in this case, only the browser process gets it set), will crash
 // rather than return potential PII.
 IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
-                       CrashWhenSubprocessWithoutArgumentFilter) {
+                       MAYBE_CrashWhenSubprocessWithoutArgumentFilter) {
   SetupBackgroundTracingManager();
 
   base::trace_event::TraceLog::GetInstance()->SetArgumentFilterPredicate(
       base::Bind(&IsTraceEventArgsWhitelisted));
 
   base::RunLoop wait_for_upload;
   BackgroundTracingManagerUploadConfigWrapper upload_config_wrapper(
       wait_for_upload.QuitClosure());
 
   std::unique_ptr<BackgroundTracingConfig> config = CreatePreemptiveConfig();
@@ skipping 840 matching lines @@
     BackgroundTracingManager::GetInstance()->TriggerNamedEvent(
         handle, base::Bind(&StartedFinalizingCallback, base::Closure(), false));
 
     run_loop.Run();
 
     EXPECT_TRUE(upload_config_wrapper.get_receive_count() == 1);
   }
 }
 
 }  // namespace content