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

google_apis/gcm/tools/mcs_probe.cc

 // Copyright 2013 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.
 //
 // A standalone tool for testing MCS connections and the MCS client on their
 // own.
 
 #include <cstddef>
 #include <cstdio>
 #include <string>
 #include <vector>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
+#include "base/files/scoped_file.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/threading/thread.h"
 #include "base/threading/worker_pool.h"
 #include "base/time/default_clock.h"
 #include "base/values.h"
@@ skipping 245 matching lines @@
     server_host_ = command_line.GetSwitchValueASCII(kServerHostSwitch);
   }
   server_port_ = kMCSServerPort;
   if (command_line.HasSwitch(kServerPortSwitch)) {
     base::StringToInt(command_line.GetSwitchValueASCII(kServerPortSwitch),
                       &server_port_);
   }
 }
 
 MCSProbe::~MCSProbe() {
+  if (logger_)
+    logger_->StopObserving(nullptr);
   file_thread_.Stop();
 }
 
 void MCSProbe::Start() {
   file_thread_.Start();
   InitializeNetworkState();
   BuildNetworkSession();
   std::vector<GURL> endpoints(1,
                               GURL("https://" +
                                    net::HostPortPair(server_host_,
@@ skipping 47 matching lines @@
     return;
   }
 
   StartMCSLogin();
 }
 
 void MCSProbe::UpdateCallback(bool success) {
 }
 
 void MCSProbe::InitializeNetworkState() {
-  FILE* log_file = NULL;
+  base::ScopedFILE log_file;
   if (command_line_.HasSwitch(kLogFileSwitch)) {
     base::FilePath log_path = command_line_.GetSwitchValuePath(kLogFileSwitch);
 #if defined(OS_WIN)
-    log_file = _wfopen(log_path.value().c_str(), L"w");
+    log_file.reset(_wfopen(log_path.value().c_str(), L"w"));
 #elif defined(OS_POSIX)
-    log_file = fopen(log_path.value().c_str(), "w");
+    log_file.reset(fopen(log_path.value().c_str(), "w"));
 #endif
   }
-  if (log_file != NULL) {
-    scoped_ptr<base::Value> net_constants(net::NetLogLogger::GetConstants());
-    logger_.reset(new net::NetLogLogger(log_file, *net_constants));
+  if (log_file.get()) {
+    logger_.reset(new net::NetLogLogger());
     logger_->set_log_level(net::NetLog::LOG_ALL_BUT_BYTES);
-    logger_->StartObserving(&net_log_);
+    logger_->StartObserving(&net_log_, log_file.Pass(), nullptr, nullptr);
   }
 
   host_resolver_ = net::HostResolver::CreateDefaultResolver(&net_log_);
 
   if (command_line_.HasSwitch(kIgnoreCertSwitch)) {
     cert_verifier_.reset(new MyTestCertVerifier());
   } else {
     cert_verifier_.reset(net::CertVerifier::CreateDefault());
   }
   system_channel_id_service_.reset(
@@ skipping 121 matching lines @@
 
   return 0;
 }
 
 }  // namespace
 }  // namespace gcm
 
 int main(int argc, char* argv[]) {
   return gcm::MCSProbeMain(argc, argv);
 }