Retry 114494 - Remove BindStateHolder and have Bind() return a Callback<> object directly."

base/debug/trace_event.h

Index: base/debug/trace_event.h
diff --git a/base/debug/trace_event.h b/base/debug/trace_event.h
index 0b3c04c1419ce22b2c2954696d07ad9dfb75c7f9..444c97514dc925ed31f46bbd3f7fdfb04399333b 100644
--- a/base/debug/trace_event.h
+++ b/base/debug/trace_event.h
@@ -789,7 +789,7 @@ class BASE_EXPORT TraceResultBuffer {
   // JSON output and during AddFragment and Finish with following JSON output
   // chunks. The callback target must live past the last calls to
   // TraceResultBuffer::Start/AddFragment/Finish.
-  void SetOutputCallback(OutputCallback json_chunk_callback);
+  void SetOutputCallback(const OutputCallback& json_chunk_callback);
 
   // Start JSON output. This resets all internal state, so you can reuse
   // the TraceResultBuffer by calling Start.
@@ -856,7 +856,8 @@ class BASE_EXPORT TraceLog {
   // undefined. Use TraceResultBuffer to convert one or more trace strings to
   // JSON.
   typedef RefCountedData<std::string> RefCountedString;
-  typedef base::Callback<void(scoped_refptr<RefCountedString>)> OutputCallback;
+  typedef base::Callback<void(const scoped_refptr<RefCountedString>&)>
+      OutputCallback;
   void SetOutputCallback(const OutputCallback& cb);
 
   // The trace buffer does not flush dynamically, so when it fills up,