Index: chrome/browser/net/chrome_net_log.cc |
diff --git a/chrome/browser/net/chrome_net_log.cc b/chrome/browser/net/chrome_net_log.cc |
index b9a417a54f03ffb4f777cbc436cf7a98b45f4370..8f0a6e3fac887ab9692e35ddc1845a8179520a7d 100644 |
--- a/chrome/browser/net/chrome_net_log.cc |
+++ b/chrome/browser/net/chrome_net_log.cc |
@@ -16,6 +16,7 @@ |
#include "chrome/common/chrome_switches.h" |
#include "content/public/common/content_switches.h" |
#include "net/base/net_log_logger.h" |
+#include "net/base/trace_net_log_observer.h" |
ChromeNetLog::ChromeNetLog() |
: net_log_temp_file_(new NetLogTempFile(this)) { |
@@ -59,6 +60,9 @@ ChromeNetLog::ChromeNetLog() |
net_log_logger_->StartObserving(this); |
} |
} |
+ |
+ trace_net_log_observer_.reset(new net::TraceNetLogObserver()); |
+ trace_net_log_observer_->WatchForTraceStart(this); |
} |
ChromeNetLog::~ChromeNetLog() { |
@@ -66,5 +70,8 @@ ChromeNetLog::~ChromeNetLog() { |
// Remove the observers we own before we're destroyed. |
if (net_log_logger_) |
RemoveThreadSafeObserver(net_log_logger_.get()); |
+ if (trace_net_log_observer_) { |
+ trace_net_log_observer_->StopWatchForTraceStart(); |
+ } |
mmenke
2014/08/15 20:42:53
nit: Don't use braces on if's when the conditiona
xunjieli
2014/08/15 21:55:15
Done. Thanks!
|
} |