Index: content/browser/tracing/tracing_controller_browsertest.cc |
diff --git a/content/browser/tracing/tracing_controller_browsertest.cc b/content/browser/tracing/tracing_controller_browsertest.cc |
index 36f0dce85a83a51ae35250970755dae7baa371f7..de41b205b95601625e143124005e747ef6517531 100644 |
--- a/content/browser/tracing/tracing_controller_browsertest.cc |
+++ b/content/browser/tracing/tracing_controller_browsertest.cc |
@@ -292,9 +292,17 @@ IN_PROC_BROWSER_TEST_F(TracingControllerTest, |
EXPECT_EQ(file_path.value(), last_actual_monitoring_file_path().value()); |
} |
+// See http://crbug.com/392446 |
+#if defined(OS_ANDROID) |
+#define MAYBE_EnableCaptureAndDisableMonitoringWithEmptyFileAndNullCallback \ |
+ DISABLED_EnableCaptureAndDisableMonitoringWithEmptyFileAndNullCallback |
+#else |
+#define MAYBE_EnableCaptureAndDisableMonitoringWithEmptyFileAndNullCallback \ |
+ EnableCaptureAndDisableMonitoringWithEmptyFileAndNullCallback |
+#endif |
IN_PROC_BROWSER_TEST_F( |
TracingControllerTest, |
- EnableCaptureAndDisableMonitoringWithEmptyFileAndNullCallback) { |
+ MAYBE_EnableCaptureAndDisableMonitoringWithEmptyFileAndNullCallback) { |
Navigate(shell()); |
TracingController* controller = TracingController::GetInstance(); |