LoadTiming in net part 7: Hooking it all up

chrome/browser/net/chrome_net_log.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 
 ChromeNetLog::ChromeNetLog()
     : 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.
   // This is done before adding any observers so the call to UpdateLogLevel when
   // an observers is added will set |effective_log_level_| correctly.
   if (command_line->HasSwitch(switches::kNetLogLevel)) {
     std::string log_level_string =
         command_line->GetSwitchValueASCII(switches::kNetLogLevel);
     int command_line_log_level;
     if (base::StringToInt(log_level_string, &command_line_log_level) &&
         command_line_log_level >= LOG_ALL &&
         command_line_log_level <= LOG_BASIC) {
       base_log_level_ = static_cast<LogLevel>(command_line_log_level);
     }
   }
 
-  load_timing_observer_->StartObserving(this);
-
   if (command_line->HasSwitch(switches::kLogNetLog)) {
     net_log_logger_.reset(new NetLogLogger(
         command_line->GetSwitchValuePath(switches::kLogNetLog)));
     net_log_logger_->StartObserving(this);
   }
 }
 
 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());
 }
 
 void ChromeNetLog::OnAddEntry(const net::NetLog::Entry& entry) {
   base::AutoLock lock(lock_);
 
   // Notify all of the log observers.
   FOR_EACH_OBSERVER(ThreadSafeObserver, observers_, OnAddEntry(entry));
 }
 
@@ skipping 45 matching lines @@
   LogLevel new_effective_log_level = base_log_level_;
   ObserverListBase<ThreadSafeObserver>::Iterator it(observers_);
   ThreadSafeObserver* observer;
   while ((observer = it.GetNext()) != NULL) {
     new_effective_log_level =
         std::min(new_effective_log_level, observer->log_level());
   }
   base::subtle::NoBarrier_Store(&effective_log_level_,
                                 new_effective_log_level);
 }