NOCOMMIT: Blink tracing now uses base

third_party/WebKit/Source/core/inspector/InspectorTraceEvents.h

Index: third_party/WebKit/Source/core/inspector/InspectorTraceEvents.h
diff --git a/third_party/WebKit/Source/core/inspector/InspectorTraceEvents.h b/third_party/WebKit/Source/core/inspector/InspectorTraceEvents.h
index 22080edca1066bf7f08f970c7c82a60833faee3e..2407305b987c57cdaf9d69336e82840347b925f6 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorTraceEvents.h
+++ b/third_party/WebKit/Source/core/inspector/InspectorTraceEvents.h
@@ -5,6 +5,7 @@
 #ifndef InspectorTraceEvents_h
 #define InspectorTraceEvents_h
 
+#include "base/trace_event/trace_event.h"
 #include "core/CoreExport.h"
 #include "core/css/CSSSelector.h"
 #include "platform/EventTracer.h"
@@ -45,8 +46,8 @@ class WorkerThread;
 class XMLHttpRequest;
 
 namespace InspectorLayoutEvent {
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> beginData(FrameView*);
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> endData(LayoutObject* rootForThisLayout);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> beginData(FrameView*);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> endData(LayoutObject* rootForThisLayout);
 }
 
 namespace InspectorScheduleStyleInvalidationTrackingEvent {
@@ -55,10 +56,10 @@ extern const char Class[];
 extern const char Id[];
 extern const char Pseudo[];
 
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> attributeChange(Element&, const InvalidationSet&, const QualifiedName&);
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> classChange(Element&, const InvalidationSet&, const AtomicString&);
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> idChange(Element&, const InvalidationSet&, const AtomicString&);
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> pseudoChange(Element&, const InvalidationSet&, CSSSelector::PseudoType);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> attributeChange(Element&, const InvalidationSet&, const QualifiedName&);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> classChange(Element&, const InvalidationSet&, const AtomicString&);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> idChange(Element&, const InvalidationSet&, const AtomicString&);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> pseudoChange(Element&, const InvalidationSet&, CSSSelector::PseudoType);
 }
 
 #define TRACE_SCHEDULE_STYLE_INVALIDATION(element, invalidationSet, changeType, ...) \
@@ -70,7 +71,7 @@ PassRefPtr<TraceEvent::ConvertableToTraceFormat> pseudoChange(Element&, const In
         InspectorScheduleStyleInvalidationTrackingEvent::changeType((element), (invalidationSet), __VA_ARGS__));
 
 namespace InspectorStyleRecalcInvalidationTrackingEvent {
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(Node*, const StyleChangeReasonForTracing&);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> data(Node*, const StyleChangeReasonForTracing&);
 }
 
 String descendantInvalidationSetToIdString(const InvalidationSet&);
@@ -84,9 +85,9 @@ extern const char InvalidationSetMatchedId[];
 extern const char InvalidationSetMatchedTagName[];
 extern const char PreventStyleSharingForParent[];
 
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(Element&, const char* reason);
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> selectorPart(Element&, const char* reason, const InvalidationSet&, const String&);
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> invalidationList(Element&, const WillBeHeapVector<RefPtrWillBeMember<InvalidationSet>>&);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> data(Element&, const char* reason);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> selectorPart(Element&, const char* reason, const InvalidationSet&, const String&);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> invalidationList(Element&, const WillBeHeapVector<RefPtrWillBeMember<InvalidationSet>>&);
 }
 
 #define TRACE_STYLE_INVALIDATOR_INVALIDATION(element, reason) \
@@ -149,76 +150,76 @@ extern const char ScrollbarChanged[];
 typedef const char LayoutInvalidationReasonForTracing[];
 
 namespace InspectorLayoutInvalidationTrackingEvent {
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> CORE_EXPORT data(const LayoutObject*, LayoutInvalidationReasonForTracing);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> CORE_EXPORT data(const LayoutObject*, LayoutInvalidationReasonForTracing);
 }
 
 namespace InspectorPaintInvalidationTrackingEvent {
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(const LayoutObject*, const LayoutObject& paintContainer);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> data(const LayoutObject*, const LayoutObject& paintContainer);
 }
 
 namespace InspectorScrollInvalidationTrackingEvent {
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(const LayoutObject&);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> data(const LayoutObject&);
 }
 
 namespace InspectorSendRequestEvent {
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(unsigned long identifier, LocalFrame*, const ResourceRequest&);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> data(unsigned long identifier, LocalFrame*, const ResourceRequest&);
 }
 
 namespace InspectorReceiveResponseEvent {
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(unsigned long identifier, LocalFrame*, const ResourceResponse&);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> data(unsigned long identifier, LocalFrame*, const ResourceResponse&);
 }
 
 namespace InspectorReceiveDataEvent {
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(unsigned long identifier, LocalFrame*, int encodedDataLength);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> data(unsigned long identifier, LocalFrame*, int encodedDataLength);
 }
 
 namespace InspectorResourceFinishEvent {
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(unsigned long identifier, double finishTime, bool didFail);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> data(unsigned long identifier, double finishTime, bool didFail);
 }
 
 namespace InspectorTimerInstallEvent {
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(ExecutionContext*, int timerId, int timeout, bool singleShot);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> data(ExecutionContext*, int timerId, int timeout, bool singleShot);
 }
 
 namespace InspectorTimerRemoveEvent {
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(ExecutionContext*, int timerId);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> data(ExecutionContext*, int timerId);
 }
 
 namespace InspectorTimerFireEvent {
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(ExecutionContext*, int timerId);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> data(ExecutionContext*, int timerId);
 }
 
 namespace InspectorIdleCallbackRequestEvent {
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(ExecutionContext*, int id, double timeout);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> data(ExecutionContext*, int id, double timeout);
 }
 
 namespace InspectorIdleCallbackCancelEvent {
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(ExecutionContext*, int id);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> data(ExecutionContext*, int id);
 }
 
 namespace InspectorIdleCallbackFireEvent {
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(ExecutionContext*, int id, double allottedMilliseconds, bool timedOut);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> data(ExecutionContext*, int id, double allottedMilliseconds, bool timedOut);
 }
 
 namespace InspectorAnimationFrameEvent {
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(ExecutionContext*, int callbackId);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> data(ExecutionContext*, int callbackId);
 }
 
 namespace InspectorParseHtmlEvent {
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> beginData(Document*, unsigned startLine);
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> endData(unsigned endLine);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> beginData(Document*, unsigned startLine);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> endData(unsigned endLine);
 }
 
 namespace InspectorParseAuthorStyleSheetEvent {
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(const CSSStyleSheetResource*);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> data(const CSSStyleSheetResource*);
 }
 
 namespace InspectorXhrReadyStateChangeEvent {
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(ExecutionContext*, XMLHttpRequest*);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> data(ExecutionContext*, XMLHttpRequest*);
 }
 
 namespace InspectorXhrLoadEvent {
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(ExecutionContext*, XMLHttpRequest*);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> data(ExecutionContext*, XMLHttpRequest*);
 }
 
 namespace InspectorLayerInvalidationTrackingEvent {
@@ -228,7 +229,7 @@ extern const char RemovedFromSquashingLayer[];
 extern const char ReflectionLayerChanged[];
 extern const char NewCompositedLayer[];
 
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(const DeprecatedPaintLayer*, const char* reason);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> data(const DeprecatedPaintLayer*, const char* reason);
 }
 
 #define TRACE_LAYER_INVALIDATION(LAYER, REASON) \
@@ -240,81 +241,81 @@ PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(const DeprecatedPaintLayer
         InspectorLayerInvalidationTrackingEvent::data((LAYER), (REASON)));
 
 namespace InspectorPaintEvent {
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(LayoutObject*, const LayoutRect& clipRect, const GraphicsLayer*);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> data(LayoutObject*, const LayoutRect& clipRect, const GraphicsLayer*);
 }
 
 namespace InspectorPaintImageEvent {
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(const LayoutImage&);
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(const LayoutObject&, const StyleImage&);
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(const LayoutObject*, const ImageResource&);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> data(const LayoutImage&);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> data(const LayoutObject&, const StyleImage&);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> data(const LayoutObject*, const ImageResource&);
 }
 
 namespace InspectorCommitLoadEvent {
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(LocalFrame*);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> data(LocalFrame*);
 }
 
 namespace InspectorMarkLoadEvent {
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(LocalFrame*);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> data(LocalFrame*);
 }
 
 namespace InspectorScrollLayerEvent {
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(LayoutObject*);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> data(LayoutObject*);
 }
 
 namespace InspectorUpdateLayerTreeEvent {
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(LocalFrame*);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> data(LocalFrame*);
 }
 
 namespace InspectorEvaluateScriptEvent {
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(LocalFrame*, const String& url, int lineNumber);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> data(LocalFrame*, const String& url, int lineNumber);
 }
 
 namespace InspectorFunctionCallEvent {
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(ExecutionContext*, int scriptId, const String& scriptName, int scriptLine);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> data(ExecutionContext*, int scriptId, const String& scriptName, int scriptLine);
 }
 
 namespace InspectorUpdateCountersEvent {
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> data();
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> data();
 }
 
 namespace InspectorInvalidateLayoutEvent {
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(LocalFrame*);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> data(LocalFrame*);
 }
 
 namespace InspectorRecalculateStylesEvent {
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(LocalFrame*);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> data(LocalFrame*);
 }
 
 namespace InspectorEventDispatchEvent {
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(const Event&);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> data(const Event&);
 }
 
 namespace InspectorTimeStampEvent {
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(ExecutionContext*, const String& message);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> data(ExecutionContext*, const String& message);
 }
 
 namespace InspectorTracingSessionIdForWorkerEvent {
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(const String& sessionId, const String& workerId, WorkerThread*);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> data(const String& sessionId, const String& workerId, WorkerThread*);
 }
 
 namespace InspectorTracingStartedInFrame {
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(const String& sessionId, LocalFrame*);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> data(const String& sessionId, LocalFrame*);
 }
 
 namespace InspectorSetLayerTreeId {
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(const String& sessionId, int layerTreeId);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> data(const String& sessionId, int layerTreeId);
 }
 
 namespace InspectorAnimationEvent {
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(const Animation&);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> data(const Animation&);
 }
 
 namespace InspectorAnimationStateEvent {
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(const Animation&);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> data(const Animation&);
 }
 
 namespace InspectorHitTestEvent {
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> endData(const HitTestRequest&, const HitTestLocation&, const HitTestResult&);
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> endData(const HitTestRequest&, const HitTestLocation&, const HitTestResult&);
 }
 
 CORE_EXPORT String toHexString(const void* p);