Index: content/browser/tracing/tracing_controller_impl.h |
diff --git a/content/browser/tracing/tracing_controller_impl.h b/content/browser/tracing/tracing_controller_impl.h |
index 0d2e4d81ddc448cdc8e2bfca9f2ab4e0b87c8805..4964c99eec93513f1489cf76f9de0e79f175d232 100644 |
--- a/content/browser/tracing/tracing_controller_impl.h |
+++ b/content/browser/tracing/tracing_controller_impl.h |
@@ -11,6 +11,7 @@ |
#include "base/lazy_instance.h" |
#include "base/trace_event/memory_dump_manager.h" |
+#include "base/trace_event/tracing_agent.h" |
#include "content/public/browser/tracing_controller.h" |
namespace base { |
@@ -25,7 +26,8 @@ class TracingUI; |
class TracingControllerImpl |
: public TracingController, |
- public base::trace_event::MemoryDumpManagerDelegate { |
+ public base::trace_event::MemoryDumpManagerDelegate, |
+ public base::trace_event::TracingAgent { |
public: |
static TracingControllerImpl* GetInstance(); |
@@ -55,6 +57,16 @@ class TracingControllerImpl |
void RegisterTracingUI(TracingUI* tracing_ui); |
void UnregisterTracingUI(TracingUI* tracing_ui); |
+ // base::trace_event::TracingAgent implementation. |
+ std::string GetTracingAgentName() override; |
+ bool StartAgentTracing( |
+ const base::trace_event::TraceConfig& trace_config) override; |
+ void StopAgentTracing(const StopAgentTracingCallback& callback) override; |
+ bool SupportsExplicitClockSync() override; |
+ void RecordClockSyncMarker( |
+ scoped_ptr<base::DictionaryValue> marker) override; |
+ void IssueClockSyncMarker() override; |
+ |
// base::trace_event::MemoryDumpManagerDelegate implementation. |
void RequestGlobalMemoryDump( |
const base::trace_event::MemoryDumpRequestArgs& args, |
@@ -151,7 +163,7 @@ class TracingControllerImpl |
int mode, |
const base::Closure& callback); |
void SetDisabledOnFileThread(const base::Closure& callback); |
- void OnStartTracingDone( |
+ void OnStartAgentTracingDone( |
const base::trace_event::TraceConfig& trace_config, |
const StartTracingDoneCallback& callback); |
void OnStopTracingDone(); |
@@ -186,6 +198,7 @@ class TracingControllerImpl |
uint64 pending_memory_dump_guid_; |
base::trace_event::MemoryDumpCallback pending_memory_dump_callback_; |
+ StartTracingDoneCallback start_tracing_done_callback_; |
#if defined(OS_CHROMEOS) || defined(OS_WIN) |
bool is_system_tracing_; |
#endif |