| Index: net/base/trace_net_log_observer.cc
|
| diff --git a/net/base/trace_net_log_observer.cc b/net/base/trace_net_log_observer.cc
|
| index 15960c3b43d674290b228b5296847ed337ce1f4a..d5724bea5b18c44198e812506b5b9f1395f9afeb 100644
|
| --- a/net/base/trace_net_log_observer.cc
|
| +++ b/net/base/trace_net_log_observer.cc
|
| @@ -40,6 +40,9 @@ class TracedValue : public base::debug::ConvertableToTraceFormat {
|
| scoped_ptr<base::Value> value_;
|
| };
|
|
|
| +// TraceLog category for NetLog events.
|
| +const char kNetLogTracingCategory[] = "disabled-by-default-netlog";
|
| +
|
| } // namespace
|
|
|
| TraceNetLogObserver::TraceNetLogObserver() : net_log_to_watch_(NULL) {
|
| @@ -55,21 +58,24 @@ void TraceNetLogObserver::OnAddEntry(const NetLog::Entry& entry) {
|
| switch (entry.phase()) {
|
| case NetLog::PHASE_BEGIN:
|
| TRACE_EVENT_NESTABLE_ASYNC_BEGIN2(
|
| - "netlog", NetLog::EventTypeToString(entry.type()), entry.source().id,
|
| + kNetLogTracingCategory,
|
| + NetLog::EventTypeToString(entry.type()), entry.source().id,
|
| "source_type", NetLog::SourceTypeToString(entry.source().type),
|
| "params", scoped_refptr<base::debug::ConvertableToTraceFormat>(
|
| new TracedValue(params.Pass())));
|
| break;
|
| case NetLog::PHASE_END:
|
| TRACE_EVENT_NESTABLE_ASYNC_END2(
|
| - "netlog", NetLog::EventTypeToString(entry.type()), entry.source().id,
|
| + kNetLogTracingCategory,
|
| + NetLog::EventTypeToString(entry.type()), entry.source().id,
|
| "source_type", NetLog::SourceTypeToString(entry.source().type),
|
| "params", scoped_refptr<base::debug::ConvertableToTraceFormat>(
|
| new TracedValue(params.Pass())));
|
| break;
|
| case NetLog::PHASE_NONE:
|
| TRACE_EVENT_NESTABLE_ASYNC_INSTANT2(
|
| - "netlog", NetLog::EventTypeToString(entry.type()), entry.source().id,
|
| + kNetLogTracingCategory,
|
| + NetLog::EventTypeToString(entry.type()), entry.source().id,
|
| "source_type", NetLog::SourceTypeToString(entry.source().type),
|
| "params", scoped_refptr<base::debug::ConvertableToTraceFormat>(
|
| new TracedValue(params.Pass())));
|
|
|