Chromium Code Reviews| Index: content/browser/tracing/trace_controller_impl.cc |
| diff --git a/content/browser/tracing/trace_controller_impl.cc b/content/browser/tracing/trace_controller_impl.cc |
| index 54e0c86cb4268597afcdc557fa8bd0501761a90b..b1a5a82a96f7dfcf142fba2e6c90237cb12699c8 100644 |
| --- a/content/browser/tracing/trace_controller_impl.cc |
| +++ b/content/browser/tracing/trace_controller_impl.cc |
| @@ -14,6 +14,11 @@ |
| #include "content/public/browser/browser_message_filter.h" |
| #include "content/public/common/content_switches.h" |
| +#if defined(OS_CHROMEOS) |
| +#include "chromeos/dbus/dbus_thread_manager.h" |
| +#include "chromeos/dbus/debug_daemon_client.h" |
| +#endif |
|
dsinclair
2013/08/20 14:05:26
Is this part of the future cl as well?
DaveMoore
2013/08/20 14:58:00
Done.
|
| + |
| using base::debug::TraceLog; |
| namespace content { |
| @@ -26,9 +31,11 @@ base::LazyInstance<TraceControllerImpl>::Leaky g_controller = |
| class AutoStopTraceSubscriberStdio : public TraceSubscriberStdio { |
| public: |
| AutoStopTraceSubscriberStdio(const base::FilePath& file_path) |
| - : TraceSubscriberStdio(file_path) {} |
| + : TraceSubscriberStdio(file_path, |
| + FILE_TYPE_PROPERTY_LIST, |
| + false) {} |
| - static void EndStartupTrace(TraceSubscriberStdio* subscriber) { |
| + static void EndStartupTrace(AutoStopTraceSubscriberStdio* subscriber) { |
| if (!TraceControllerImpl::GetInstance()->EndTracingAsync(subscriber)) |
| delete subscriber; |
| // else, the tracing will end asynchronously in OnEndTracingComplete(). |