LoadTiming in net part 7: Hooking it all up

chrome/browser/net/chrome_net_log.cc

Index: chrome/browser/net/chrome_net_log.cc
===================================================================
--- chrome/browser/net/chrome_net_log.cc	(revision 184957)
+++ chrome/browser/net/chrome_net_log.cc	(working copy)
@@ -5,11 +5,11 @@
 #include "chrome/browser/net/chrome_net_log.h"
 
 #include "base/command_line.h"
+#include "base/file_util.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/net/load_timing_observer.h"
 #include "chrome/browser/net/net_log_logger.h"
 #include "chrome/browser/net/net_log_temp_file.h"
 #include "chrome/common/chrome_switches.h"
@@ -18,7 +18,6 @@
     : last_id_(0),
       base_log_level_(LOG_BASIC),
       effective_log_level_(LOG_BASIC),
-      load_timing_observer_(new LoadTimingObserver()),
       net_log_temp_file_(new NetLogTempFile(this)) {
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
   // Adjust base log level based on command line switch, if present.
@@ -35,8 +34,6 @@
     }
   }
 
-  load_timing_observer_->StartObserving(this);
-
   if (command_line->HasSwitch(switches::kLogNetLog)) {
     net_log_logger_.reset(new NetLogLogger(
         command_line->GetSwitchValuePath(switches::kLogNetLog)));
@@ -47,8 +44,7 @@
 ChromeNetLog::~ChromeNetLog() {
   net_log_temp_file_.reset();
   // Remove the observers we own before we're destroyed.
-  RemoveThreadSafeObserver(load_timing_observer_.get());
-  if (net_log_logger_.get())
+  if (net_log_logger_)
     RemoveThreadSafeObserver(net_log_logger_.get());
 }