Index: content/browser/devtools/protocol/tracing_handler.cc |
diff --git a/content/browser/devtools/protocol/tracing_handler.cc b/content/browser/devtools/protocol/tracing_handler.cc |
index 6cb81a3d3e4ce9da07b59afc2c9883487a546d48..a4319b9efd04a7bc4d0d318ab26ff556a7f553ae 100644 |
--- a/content/browser/devtools/protocol/tracing_handler.cc |
+++ b/content/browser/devtools/protocol/tracing_handler.cc |
@@ -91,8 +91,9 @@ Response TracingHandler::Start(DevToolsCommandId command_id, |
return Response::InternalError("Tracing is already started"); |
is_recording_ = true; |
- base::debug::TraceOptions options = TraceOptionsFromString(options_str); |
- base::debug::CategoryFilter filter(categories ? *categories : std::string()); |
+ base::trace_event::TraceOptions options = TraceOptionsFromString(options_str); |
+ base::trace_event::CategoryFilter filter(categories ? *categories |
+ : std::string()); |
if (buffer_usage_reporting_interval) |
SetupTimer(*buffer_usage_reporting_interval); |
@@ -157,9 +158,9 @@ void TracingHandler::OnCategoriesReceived( |
GetCategoriesResponse::Create()->set_categories(categories)); |
} |
-base::debug::TraceOptions TracingHandler::TraceOptionsFromString( |
+base::trace_event::TraceOptions TracingHandler::TraceOptionsFromString( |
const std::string* options) { |
- base::debug::TraceOptions ret; |
+ base::trace_event::TraceOptions ret; |
if (!options) |
return ret; |
@@ -169,11 +170,11 @@ base::debug::TraceOptions TracingHandler::TraceOptionsFromString( |
base::SplitString(*options, ',', &split); |
for (iter = split.begin(); iter != split.end(); ++iter) { |
if (*iter == kRecordUntilFull) { |
- ret.record_mode = base::debug::RECORD_UNTIL_FULL; |
+ ret.record_mode = base::trace_event::RECORD_UNTIL_FULL; |
} else if (*iter == kRecordContinuously) { |
- ret.record_mode = base::debug::RECORD_CONTINUOUSLY; |
+ ret.record_mode = base::trace_event::RECORD_CONTINUOUSLY; |
} else if (*iter == kRecordAsMuchAsPossible) { |
- ret.record_mode = base::debug::RECORD_AS_MUCH_AS_POSSIBLE; |
+ ret.record_mode = base::trace_event::RECORD_AS_MUCH_AS_POSSIBLE; |
} else if (*iter == kEnableSampling) { |
ret.enable_sampling = true; |
} |