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

Unified Diff: net/log/trace_net_log_observer.cc

Issue 2524043002: Android: Make netlog available in startup traces. (Closed)
Patch Set: Address comment. Created 4 years 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
« no previous file with comments | « no previous file | net/log/trace_net_log_observer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/log/trace_net_log_observer.cc
diff --git a/net/log/trace_net_log_observer.cc b/net/log/trace_net_log_observer.cc
index 4c7b7dcc605be4d7263ab6b59e589443a19fdca5..bae83a5ac141af05e17ad43ee8cd4063687843bd 100644
--- a/net/log/trace_net_log_observer.cc
+++ b/net/log/trace_net_log_observer.cc
@@ -90,6 +90,10 @@ void TraceNetLogObserver::WatchForTraceStart(NetLog* netlog) {
DCHECK(!net_log_to_watch_);
DCHECK(!net_log());
net_log_to_watch_ = netlog;
+ // Tracing can start before the observer is even created, for instance for
+ // startup tracing.
+ if (base::trace_event::TraceLog::GetInstance()->IsEnabled())
+ OnTraceLogEnabled();
base::trace_event::TraceLog::GetInstance()->AddEnabledStateObserver(this);
}
« no previous file with comments | « no previous file | net/log/trace_net_log_observer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698