[sheriff] Disable TracingControllerTests on Android Asan.

R=eseckler@chromium.org
TBR=eseckler@chromium.org

Bug: 1045519, 1041392
Change-Id: Ia4ef9f7d54ad603c8a9f11cd582440c07e2777c1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2019788
Commit-Queue: François Doray <fdoray@chromium.org>
Reviewed-by: François Doray <fdoray@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735066}

content/browser/tracing/tracing_controller_browsertest.cc

@@ -336,6 +336,28 @@ class TracingControllerTest : public ContentBrowserTest {
   std::unique_ptr<std::string> last_data_;
 };
 
+// Consistent failures on Android Asan https://crbug.com/1045519
+#if defined(OS_ANDROID) && defined(ADDRESS_SANITIZER)
+#define MAYBE_EnableAndStopTracing DISABLED_EnableAndStopTracing
+#define MAYBE_DisableRecordingStoresMetadata \
+  DISABLED_DisableRecordingStoresMetadata
+#define MAYBE_NotWhitelistedMetadataStripped \
+  DISABLED_NotWhitelistedMetadataStripped
+#define MAYBE_EnableAndStopTracingWithFilePath \
+  DISABLED_EnableAndStopTracingWithFilePath
+#define MAYBE_EnableAndStopTracingWithCompression \
+  DISABLED_EnableAndStopTracingWithCompression
+#define MAYBE_ProcessesPresentInTrace DISABLED_ProcessesPresentInTrace
+#else
+#define MAYBE_EnableAndStopTracing EnableAndStopTracing
+#define MAYBE_DisableRecordingStoresMetadata DisableRecordingStoresMetadata
+#define MAYBE_NotWhitelistedMetadataStripped NotWhitelistedMetadataStripped
+#define MAYBE_EnableAndStopTracingWithFilePath EnableAndStopTracingWithFilePath
+#define MAYBE_EnableAndStopTracingWithCompression \
+  EnableAndStopTracingWithCompression
+#define MAYBE_ProcessesPresentInTrace ProcessesPresentInTrace
+#endif
+
 IN_PROC_BROWSER_TEST_F(TracingControllerTest, GetCategories) {
   Navigate(shell());
 
@@ -350,18 +372,12 @@ IN_PROC_BROWSER_TEST_F(TracingControllerTest, GetCategories) {
   EXPECT_EQ(get_categories_done_callback_count(), 1);
 }
 
-IN_PROC_BROWSER_TEST_F(TracingControllerTest, EnableAndStopTracing) {
+IN_PROC_BROWSER_TEST_F(TracingControllerTest, MAYBE_EnableAndStopTracing) {
   TestStartAndStopTracingString();
 }
 
-#if defined(OS_ANDROID) && defined(ADDRESS_SANITIZER)
-#define MAYBE_DisableRecordingStoresMetadata \
-  DISABLED_DisableRecordingStoresMetadata
-#else
-#define MAYBE_DisableRecordingStoresMetadata DisableRecordingStoresMetadata
-#endif
 IN_PROC_BROWSER_TEST_F(TracingControllerTest,
-                       DisableRecordingStoresMetadata) {
+                       MAYBE_DisableRecordingStoresMetadata) {
   TestStartAndStopTracingString();
   // Check that a number of important keys exist in the metadata dictionary. The
   // values are not checked to ensure the test is robust.
@@ -393,13 +409,8 @@ IN_PROC_BROWSER_TEST_F(TracingControllerTest,
 #endif
 }
 
-#if defined(OS_ANDROID) && defined(ADDRESS_SANITIZER)
-#define MAYBE_NotWhitelistedMetadataStripped \
-  DISABLED_NotWhitelistedMetadataStripped
-#else
-#define MAYBE_NotWhitelistedMetadataStripped NotWhitelistedMetadataStripped
-#endif
-IN_PROC_BROWSER_TEST_F(TracingControllerTest, NotWhitelistedMetadataStripped) {
+IN_PROC_BROWSER_TEST_F(TracingControllerTest,
+                       MAYBE_NotWhitelistedMetadataStripped) {
   TestStartAndStopTracingStringWithFilter();
   // Check that a number of important keys exist in the metadata dictionary.
   base::Optional<base::Value> trace_json = base::JSONReader::Read(last_data());
@@ -420,14 +431,8 @@ IN_PROC_BROWSER_TEST_F(TracingControllerTest, NotWhitelistedMetadataStripped) {
   EXPECT_TRUE(KeyEquals(metadata_json, "v8-version", "__stripped__"));
 }
 
-#if defined(OS_ANDROID) && defined(ADDRESS_SANITIZER)
-#define MAYBE_EnableAndStopTracingWithFilePath \
-  DISABLED_EnableAndStopTracingWithFilePath
-#else
-#define MAYBE_EnableAndStopTracingWithFilePath EnableAndStopTracingWithFilePath
-#endif
 IN_PROC_BROWSER_TEST_F(TracingControllerTest,
-                       EnableAndStopTracingWithFilePath) {
+                       MAYBE_EnableAndStopTracingWithFilePath) {
   base::FilePath file_path;
   {
     base::ScopedAllowBlockingForTesting allow_blocking;
@@ -437,15 +442,8 @@ IN_PROC_BROWSER_TEST_F(TracingControllerTest,
   EXPECT_EQ(file_path.value(), last_actual_recording_file_path().value());
 }
 
-#if defined(OS_ANDROID) && defined(ADDRESS_SANITIZER)
-#define MAYBE_EnableAndStopTracingWithCompression \
-  DISABLED_EnableAndStopTracingWithCompression
-#else
-#define MAYBE_EnableAndStopTracingWithCompression \
-  EnableAndStopTracingWithCompression
-#endif
 IN_PROC_BROWSER_TEST_F(TracingControllerTest,
-                       EnableAndStopTracingWithCompression) {
+                       MAYBE_EnableAndStopTracingWithCompression) {
   TestStartAndStopTracingCompressed();
 }
 
@@ -497,12 +495,7 @@ IN_PROC_BROWSER_TEST_F(TracingControllerTest, MAYBE_SystemTraceEvents) {
   EXPECT_TRUE(last_data().find("systemTraceEvents") != std::string::npos);
 }
 
-#if defined(OS_ANDROID) && defined(ADDRESS_SANITIZER)
-#define MAYBE_ProcessesPresentInTrace DISABLED_ProcessesPresentInTrace
-#else
-#define MAYBE_ProcessesPresentInTrace ProcessesPresentInTrace
-#endif
-IN_PROC_BROWSER_TEST_F(TracingControllerTest, ProcessesPresentInTrace) {
+IN_PROC_BROWSER_TEST_F(TracingControllerTest, MAYBE_ProcessesPresentInTrace) {
   TestStartAndStopTracingString();
   EXPECT_TRUE(last_data().find("CrBrowserMain") != std::string::npos);
   EXPECT_TRUE(last_data().find("CrRendererMain") != std::string::npos);