Merge gpu_trace_event back into base/debug/trace_event

content/browser/trace_controller.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_TRACE_CONTROLLER_H_
 #define CONTENT_BROWSER_TRACE_CONTROLLER_H_
 
 #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"
 
 class TraceMessageFilter;
 
 // Objects interested in receiving trace data derive from TraceSubscriber.
 // See also: trace_message_filter.h
 // See also: child_trace_message_filter.h
 class TraceSubscriber {
@@ skipping 82 matching lines @@
 
   bool can_begin_tracing() const { return !is_tracing_; }
 
   // Methods for use by TraceMessageFilter.
 
   // Passing as scoped_refptr so that the method can be run asynchronously as
   // a task safely (otherwise the TraceMessageFilter could be destructed).
   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);
 
   FilterMap filters_;
   TraceSubscriber* subscriber_;
   // Pending acks for EndTracingAsync:
   int pending_end_ack_count_;
   // Pending acks for GetTraceBufferPercentFullAsync:
   int pending_bpf_ack_count_;
   float maximum_bpf_;
   bool is_tracing_;
 
   DISALLOW_COPY_AND_ASSIGN(TraceController);
 };
 
 DISABLE_RUNNABLE_METHOD_REFCOUNT(TraceController);
 
 #endif  // CONTENT_BROWSER_TRACE_CONTROLLER_H_