Add ability for NetLogLogger to gather data from more than just NetLog

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 <stdio.h>
 
 #include "base/command_line.h"
+#include "base/files/scoped_file.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/net/net_log_temp_file.h"
 #include "chrome/browser/ui/webui/net_internals/net_internals_ui.h"
 #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)) {
   const base::CommandLine* command_line =
       base::CommandLine::ForCurrentProcess();
 
   if (command_line->HasSwitch(switches::kLogNetLog)) {
     base::FilePath log_path =
         command_line->GetSwitchValuePath(switches::kLogNetLog);
     // Much like logging.h, bypass threading restrictions by using fopen
     // directly.  Have to write on a thread that's shutdown to handle events on
     // shutdown properly, and posting events to another thread as they occur
     // would result in an unbounded buffer size, so not much can be gained by
     // doing this on another thread.  It's only used when debugging Chrome, so
     // performance is not a big concern.
-    FILE* file = NULL;
+    base::ScopedFILE file;
 #if defined(OS_WIN)
-    file = _wfopen(log_path.value().c_str(), L"w");
+    file.reset(_wfopen(log_path.value().c_str(), L"w"));
 #elif defined(OS_POSIX)
-    file = fopen(log_path.value().c_str(), "w");
+    file.reset(fopen(log_path.value().c_str(), "w"));
 #endif
 
-    if (file == NULL) {
+    if (!file) {
       LOG(ERROR) << "Could not open file " << log_path.value()
                  << " for net logging";
     } else {
       scoped_ptr<base::Value> constants(NetInternalsUI::GetConstants());
-      net_log_logger_.reset(new net::NetLogLogger(file, *constants));
+      net_log_logger_.reset(new net::NetLogLogger());
       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_NONE) {
           net_log_logger_->set_log_level(
               static_cast<LogLevel>(command_line_log_level));
         }
       }
-      net_log_logger_->StartObserving(this);
+      net_log_logger_->StartObserving(this, file.Pass(), constants.get(),
+                                      nullptr);
     }
   }
 
   trace_net_log_observer_.reset(new net::TraceNetLogObserver());
   trace_net_log_observer_->WatchForTraceStart(this);
 }
 
 ChromeNetLog::~ChromeNetLog() {
   net_log_temp_file_.reset();
   // Remove the observers we own before we're destroyed.
   if (net_log_logger_)
-    RemoveThreadSafeObserver(net_log_logger_.get());
+    net_log_logger_->StopObserving(nullptr);
   if (trace_net_log_observer_)
     trace_net_log_observer_->StopWatchForTraceStart();
 }