Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(911)

Unified Diff: third_party/WebKit/Source/modules/websockets/InspectorWebSocketEvents.cpp

Issue 1381023002: NOCOMMIT: Blink tracing now uses base Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/modules/websockets/InspectorWebSocketEvents.cpp
diff --git a/third_party/WebKit/Source/modules/websockets/InspectorWebSocketEvents.cpp b/third_party/WebKit/Source/modules/websockets/InspectorWebSocketEvents.cpp
index 22b36ed130129498cf166b4abdd4cebb86a48137..331d95addc9901db112113ea5e7d22632b72d7fa 100644
--- a/third_party/WebKit/Source/modules/websockets/InspectorWebSocketEvents.cpp
+++ b/third_party/WebKit/Source/modules/websockets/InspectorWebSocketEvents.cpp
@@ -11,25 +11,25 @@
namespace blink {
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorWebSocketCreateEvent::data(Document* document, unsigned long identifier, const KURL& url, const String& protocol)
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> InspectorWebSocketCreateEvent::data(Document* document, unsigned long identifier, const KURL& url, const String& protocol)
{
- RefPtr<TracedValue> value = TracedValue::create();
+ scoped_refptr<TracedValue> value = TracedValue::create();
value->setInteger("identifier", identifier);
value->setString("url", url.string());
value->setString("frame", toHexString(document->frame()));
if (!protocol.isNull())
value->setString("webSocketProtocol", protocol);
setCallStack(value.get());
- return value.release();
+ return value;
}
-PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorWebSocketEvent::data(Document* document, unsigned long identifier)
+scoped_refptr<base::trace_event::ConvertableToTraceFormat> InspectorWebSocketEvent::data(Document* document, unsigned long identifier)
{
- RefPtr<TracedValue> value = TracedValue::create();
+ scoped_refptr<TracedValue> value = TracedValue::create();
value->setInteger("identifier", identifier);
value->setString("frame", toHexString(document->frame()));
setCallStack(value.get());
- return value.release();
+ return value;
}
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698