Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(364)

Unified Diff: content/browser/tracing/memory_tracing_browsertest.cc

Issue 2479593002: Tracing: Bail out early in tracing tests when tracing is already enabled. (Closed)
Patch Set: wording Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/tracing/child/child_trace_message_filter_browsertest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/tracing/memory_tracing_browsertest.cc
diff --git a/content/browser/tracing/memory_tracing_browsertest.cc b/content/browser/tracing/memory_tracing_browsertest.cc
index ab9b9e3f67d3307d91f5866f63f11bbe439900bd..c015532545d76bb436d9cd4ae7197d66926fb9cc 100644
--- a/content/browser/tracing/memory_tracing_browsertest.cc
+++ b/content/browser/tracing/memory_tracing_browsertest.cc
@@ -110,9 +110,12 @@ class MemoryTracingTest : public ContentBrowserTest {
}
void EnableMemoryTracing() {
- CHECK(!base::trace_event::TraceLog::GetInstance()->IsEnabled())
- << "Tracing seems to be already enabled. Very likely this is because "
- "the startup tracing file has been leaked from a previous test.";
+ // Re-enabling tracing could crash these tests https://crbug.com/657628 .
+ if (base::trace_event::TraceLog::GetInstance()->IsEnabled()) {
+ FAIL() << "Tracing seems to be already enabled. "
+ "Very likely this is because the startup tracing file "
+ "has been leaked from a previous test.";
+ }
// Enable tracing without periodic dumps.
base::trace_event::TraceConfig trace_config(
base::trace_event::TraceConfigMemoryTestUtil::
« no previous file with comments | « components/tracing/child/child_trace_message_filter_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698