| Index: content/browser/tracing/etw_tracing_agent_win.cc
|
| diff --git a/content/browser/tracing/etw_tracing_agent_win.cc b/content/browser/tracing/etw_tracing_agent_win.cc
|
| index 8d4cfa20ea8e17f60059519d5bdabf0a7a5cc5ff..4392084d2b32f2e2b8b016820466401a5d5f29dc 100644
|
| --- a/content/browser/tracing/etw_tracing_agent_win.cc
|
| +++ b/content/browser/tracing/etw_tracing_agent_win.cc
|
| @@ -166,15 +166,12 @@ void EtwTracingAgent::AddSyncEventToBuffer() {
|
|
|
| // Add fields to the event.
|
| std::unique_ptr<base::DictionaryValue> value(new base::DictionaryValue());
|
| - value->Set("guid", new base::StringValue("ClockSync"));
|
| - value->Set("walltime", new base::StringValue(
|
| - base::StringPrintf("%08X%08X",
|
| - walltime_in_us.HighPart,
|
| - walltime_in_us.LowPart)));
|
| - value->Set("tick", new base::StringValue(
|
| - base::StringPrintf("%08X%08X",
|
| - now_in_us.HighPart,
|
| - now_in_us.LowPart)));
|
| + value->Set("guid", new base::Value("ClockSync"));
|
| + value->Set("walltime",
|
| + new base::Value(base::StringPrintf(
|
| + "%08X%08X", walltime_in_us.HighPart, walltime_in_us.LowPart)));
|
| + value->Set("tick", new base::Value(base::StringPrintf(
|
| + "%08X%08X", now_in_us.HighPart, now_in_us.LowPart)));
|
|
|
| // Append it to the events buffer.
|
| events_->Append(value.release());
|
| @@ -188,10 +185,10 @@ void EtwTracingAgent::AppendEventToBuffer(EVENT_TRACE* event) {
|
| // Add header fields to the event.
|
| LARGE_INTEGER ts_us;
|
| ts_us.QuadPart = event->Header.TimeStamp.QuadPart / 10;
|
| - value->Set("ts", new base::StringValue(
|
| - base::StringPrintf("%08X%08X", ts_us.HighPart, ts_us.LowPart)));
|
| + value->Set("ts", new base::Value(base::StringPrintf(
|
| + "%08X%08X", ts_us.HighPart, ts_us.LowPart)));
|
|
|
| - value->Set("guid", new base::StringValue(GuidToString(event->Header.Guid)));
|
| + value->Set("guid", new base::Value(GuidToString(event->Header.Guid)));
|
|
|
| value->Set("op", new Value(event->Header.Class.Type));
|
| value->Set("ver", new Value(event->Header.Class.Version));
|
| @@ -204,7 +201,7 @@ void EtwTracingAgent::AppendEventToBuffer(EVENT_TRACE* event) {
|
| event->MofLength);
|
| std::string payload;
|
| base::Base64Encode(buffer, &payload);
|
| - value->Set("payload", new base::StringValue(payload));
|
| + value->Set("payload", new base::Value(payload));
|
|
|
| // Append it to the events buffer.
|
| events_->Append(value.release());
|
| @@ -228,7 +225,7 @@ void EtwTracingAgent::FlushOnThread(
|
| const StopAgentTracingCallback& callback) {
|
| // Add the header information to the stream.
|
| std::unique_ptr<base::DictionaryValue> header(new base::DictionaryValue());
|
| - header->Set("name", new base::StringValue("ETW"));
|
| + header->Set("name", new base::Value("ETW"));
|
|
|
| // Release and pass the events buffer.
|
| header->Set("content", events_.release());
|
|
|