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

Unified Diff: chrome/test/base/tracing.cc

Issue 2572393002: Fix crashes in TracingBrowserTest.TestMemoryInfra (Closed)
Patch Set: . Created 4 years 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 | « chrome/test/base/tracing.h ('k') | chrome/test/base/tracing_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/tracing.cc
diff --git a/chrome/test/base/tracing.cc b/chrome/test/base/tracing.cc
index f210652a5aaba2190ae6c3c60322b543bacc5bcc..ab89cc8153e35885b6485582d357f1b2394f5d1f 100644
--- a/chrome/test/base/tracing.cc
+++ b/chrome/test/base/tracing.cc
@@ -53,10 +53,12 @@ class InProcessTraceController {
InProcessTraceController() {}
virtual ~InProcessTraceController() {}
- bool BeginTracing(const base::trace_event::TraceConfig& trace_config) {
+ bool BeginTracing(
+ const base::trace_event::TraceConfig& trace_config,
+ tracing::StartTracingDoneCallback start_tracing_done_callback) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
return content::TracingController::GetInstance()->StartTracing(
- trace_config, content::TracingController::StartTracingDoneCallback());
+ trace_config, start_tracing_done_callback);
}
bool EndTracing(std::string* json_trace_output) {
@@ -99,12 +101,21 @@ namespace tracing {
bool BeginTracing(const std::string& category_patterns) {
return InProcessTraceController::GetInstance()->BeginTracing(
- base::trace_event::TraceConfig(category_patterns, ""));
+ base::trace_event::TraceConfig(category_patterns, ""),
+ tracing::StartTracingDoneCallback());
}
bool BeginTracingWithTraceConfig(
const base::trace_event::TraceConfig& trace_config) {
- return InProcessTraceController::GetInstance()->BeginTracing(trace_config);
+ return InProcessTraceController::GetInstance()->BeginTracing(
+ trace_config, tracing::StartTracingDoneCallback());
+}
+
+bool BeginTracingWithTraceConfig(
+ const base::trace_event::TraceConfig& trace_config,
+ tracing::StartTracingDoneCallback start_tracing_done_callback) {
+ return InProcessTraceController::GetInstance()->BeginTracing(
+ trace_config, start_tracing_done_callback);
}
bool EndTracing(std::string* json_trace_output) {
« no previous file with comments | « chrome/test/base/tracing.h ('k') | chrome/test/base/tracing_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698