Merge gpu_trace_event back into base/debug/trace_event

content/browser/trace_controller.h

Index: content/browser/trace_controller.h
diff --git a/content/browser/trace_controller.h b/content/browser/trace_controller.h
index 4308e82353d0e536a92aa9e59b5be865f5b0dfee..33e14c6ef4ec3fea0ed9a4cc6333ed8ff3de2647 100644
--- a/content/browser/trace_controller.h
+++ b/content/browser/trace_controller.h
@@ -8,6 +8,7 @@
 #include <set>
 #include <string>
 
+#include "base/debug/trace_event.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/singleton.h"
 #include "base/task.h"
@@ -110,7 +111,9 @@ class TraceController {
   void AddFilter(TraceMessageFilter* filter);
   void RemoveFilter(TraceMessageFilter* filter);
   void OnEndTracingAck();
-  void OnTraceDataCollected(const std::string& data);
+  void OnTraceDataCollected(
+      const scoped_refptr<base::debug::TraceLog::RefCountedString>&
+          json_events_str_ptr);
   void OnTraceBufferFull();
   void OnTraceBufferPercentFullReply(float percent_full);