Commit 44c5706d authored by Oystein Eftevaag's avatar Oystein Eftevaag Committed by Commit Bot

Tracing: Reenabled StartupTracingInProcessTest.TestFilledStartupBuffer

Looks like the deadlocks have all been fixed; speculatively re-enabling.

Bug: 950718
Change-Id: I7bf22cc8583e85fbea0a2471f5e9e691158486cf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1605168
Commit-Queue: oysteine <oysteine@chromium.org>
Reviewed-by: default avatarssid <ssid@chromium.org>
Cr-Commit-Position: refs/heads/master@{#658757}
parent 41147b90
...@@ -122,8 +122,7 @@ class LargeTraceEventData : public base::trace_event::ConvertableToTraceFormat { ...@@ -122,8 +122,7 @@ class LargeTraceEventData : public base::trace_event::ConvertableToTraceFormat {
// StartupTraceWriter, which Perfetto will then have to sync copy into // StartupTraceWriter, which Perfetto will then have to sync copy into
// the SMB once the full tracing service starts up. This is to catch common // the SMB once the full tracing service starts up. This is to catch common
// deadlocks. // deadlocks.
IN_PROC_BROWSER_TEST_F(StartupTracingInProcessTest, IN_PROC_BROWSER_TEST_F(StartupTracingInProcessTest, TestFilledStartupBuffer) {
DISABLED_TestFilledStartupBuffer) {
tracing::TraceEventDataSource::GetInstance()->SetupStartupTracing( tracing::TraceEventDataSource::GetInstance()->SetupStartupTracing(
/*privacy_filtering_enabled=*/false); /*privacy_filtering_enabled=*/false);
...@@ -145,6 +144,15 @@ IN_PROC_BROWSER_TEST_F(StartupTracingInProcessTest, ...@@ -145,6 +144,15 @@ IN_PROC_BROWSER_TEST_F(StartupTracingInProcessTest,
wait_for_tracing.Run(); wait_for_tracing.Run();
NavigateToURL(shell(), GetTestUrl("", "title1.html")); NavigateToURL(shell(), GetTestUrl("", "title1.html"));
base::RunLoop wait_for_stop;
TracingControllerImpl::GetInstance()->StopTracing(
TracingController::CreateStringEndpoint(base::BindRepeating(
[](base::RepeatingClosure quit_callback,
std::unique_ptr<const base::DictionaryValue> metadata,
base::RefCountedString* data) { quit_callback.Run(); },
wait_for_stop.QuitClosure())));
wait_for_stop.Run();
} }
class BackgroundStartupTracingTest : public ContentBrowserTest { class BackgroundStartupTracingTest : public ContentBrowserTest {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment