diff options
| author | nednguyen@google.com <nednguyen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-08 01:23:59 +0000 |
|---|---|---|
| committer | nednguyen@google.com <nednguyen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-08 01:23:59 +0000 |
| commit | 63e18ddaee9078a1925dff1a52693bb4c0808456 (patch) | |
| tree | e997963e42909e41f7e9b03817223d2f29a7ff21 /components/tracing/child_trace_message_filter.cc | |
| parent | 24c4f183d76908700d7870edcfb7c3300b508dc3 (diff) | |
| download | chromium_src-63e18ddaee9078a1925dff1a52693bb4c0808456.zip chromium_src-63e18ddaee9078a1925dff1a52693bb4c0808456.tar.gz chromium_src-63e18ddaee9078a1925dff1a52693bb4c0808456.tar.bz2 | |
Remove TraceOptions string based constructor. Add setter method
SetFromString that allows setting TraceOptions from a string instead.
SetFromString returns true upon success.
BUG=400382
Review URL: https://codereview.chromium.org/443523003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288193 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/tracing/child_trace_message_filter.cc')
| -rw-r--r-- | components/tracing/child_trace_message_filter.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/components/tracing/child_trace_message_filter.cc b/components/tracing/child_trace_message_filter.cc index e3daa1a..fe13ff5 100644 --- a/components/tracing/child_trace_message_filter.cc +++ b/components/tracing/child_trace_message_filter.cc @@ -59,11 +59,12 @@ void ChildTraceMessageFilter::OnBeginTracing( browser_time; TraceLog::GetInstance()->SetTimeOffset(time_offset); #endif - + base::debug::TraceOptions trace_options; + trace_options.SetFromString(options); TraceLog::GetInstance()->SetEnabled( base::debug::CategoryFilter(category_filter_str), base::debug::TraceLog::RECORDING_MODE, - base::debug::TraceOptions(options)); + trace_options); } void ChildTraceMessageFilter::OnEndTracing() { @@ -81,10 +82,12 @@ void ChildTraceMessageFilter::OnEnableMonitoring( const std::string& category_filter_str, base::TimeTicks browser_time, const std::string& options) { + base::debug::TraceOptions trace_options; + trace_options.SetFromString(options); TraceLog::GetInstance()->SetEnabled( base::debug::CategoryFilter(category_filter_str), base::debug::TraceLog::MONITORING_MODE, - base::debug::TraceOptions(options)); + trace_options); } void ChildTraceMessageFilter::OnDisableMonitoring() { |