[tracing] Use increased timeout for tracing tests

Tests are really slow when both tracing and sanitizers are enabled.
Increase the RunLoop timeout for tracing tests to avoid test failures in
that case.

R=eseckler@chromium.org
BUG=1157954,1041392

Change-Id: Icc5f077d342587b82cf699ff41122e3c30a7b5e8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2616018
Commit-Queue: Eric Seckler <eseckler@chromium.org>
Reviewed-by: Eric Seckler <eseckler@chromium.org>
Cr-Commit-Position: refs/heads/master@{#841469}

content/browser/tracing/startup_tracing_browsertest.cc

@@ -7,6 +7,7 @@
 #include "base/run_loop.h"
 #include "base/test/bind.h"
 #include "base/test/scoped_feature_list.h"
+#include "base/test/scoped_run_loop_timeout.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ -279,6 +280,9 @@ class StartupTracingTest
   base::FilePath temp_file_path_;
 
  private:
+  base::test::ScopedRunLoopTimeout increased_timeout_{
+      FROM_HERE, TestTimeouts::test_launcher_timeout()};
+
   DISALLOW_COPY_AND_ASSIGN(StartupTracingTest);
 };
 
@@ -294,15 +298,7 @@ INSTANTIATE_TEST_SUITE_P(
             OutputLocation::kDirectoryWithDefaultBasename,
             OutputLocation::kDirectoryWithBasenameUpdatedBeforeStop)));
 
-// Failing on Android/Win ASAN, Linux TSAN. crbug.com/1041392
-#if (defined(OS_ANDROID) && defined(ADDRESS_SANITIZER)) || \
-    (defined(OS_WIN) && defined(ADDRESS_SANITIZER)) ||     \
-    ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(THREAD_SANITIZER))
-#define MAYBE_TestEnableTracing DISABLED_TestStartupTracing
-#else
-#define MAYBE_TestEnableTracing TestStartupTracing
-#endif
-IN_PROC_BROWSER_TEST_P(StartupTracingTest, MAYBE_TestEnableTracing) {
+IN_PROC_BROWSER_TEST_P(StartupTracingTest, TestEnableTracing) {
   EXPECT_TRUE(NavigateToURL(shell(), GetTestUrl("", "title1.html")));
 
   if (GetOutputLocation() ==