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

chrome/browser/net/net_log_temp_file.cc

 // Copyright (c) 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.
 
 #include "chrome/browser/net/net_log_temp_file.h"
 
 #include "base/files/file_util.h"
+#include "base/files/scoped_file.h"
 #include "base/values.h"
 #include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/ui/webui/net_internals/net_internals_ui.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/net_log_logger.h"
 
 using content::BrowserThread;
 
 NetLogTempFile::NetLogTempFile(ChromeNetLog* chrome_net_log)
     : state_(STATE_UNINITIALIZED),
       log_type_(LOG_TYPE_NONE),
       log_filename_(FILE_PATH_LITERAL("chrome-net-export-log.json")),
       chrome_net_log_(chrome_net_log) {
 }
 
 NetLogTempFile::~NetLogTempFile() {
   if (net_log_logger_)
-    net_log_logger_->StopObserving();
+    net_log_logger_->StopObserving(nullptr);
 }
 
 void NetLogTempFile::ProcessCommand(Command command) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE_USER_BLOCKING));
   if (!EnsureInit())
     return;
 
   switch (command) {
     case DO_START_LOG_BYTES:
       StartNetLog(LOG_TYPE_LOG_BYTES);
@@ skipping 92 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE_USER_BLOCKING));
   if (state_ == STATE_LOGGING)
     return;
 
   DCHECK_NE(STATE_UNINITIALIZED, state_);
   DCHECK(!log_path_.empty());
 
   // Try to make sure we can create the file.
   // TODO(rtenneti): Find a better for doing the following. Surface some error
   // to the user if we couldn't create the file.
-  FILE* file = base::OpenFile(log_path_, "w");
-  if (file == NULL)
+  base::ScopedFILE file(base::OpenFile(log_path_, "w"));
+  if (!file)
     return;
 
   log_type_ = log_type;
   state_ = STATE_LOGGING;
 
   scoped_ptr<base::Value> constants(NetInternalsUI::GetConstants());
-  net_log_logger_.reset(new net::NetLogLogger(file, *constants));
+  net_log_logger_.reset(new net::NetLogLogger());
   net_log_logger_->set_log_level(GetLogLevelForLogType(log_type));
-  net_log_logger_->StartObserving(chrome_net_log_);
+  net_log_logger_->StartObserving(chrome_net_log_, file.Pass(), constants.get(),
+                                  nullptr);
 }
 
 void NetLogTempFile::StopNetLog() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE_USER_BLOCKING));
   if (state_ != STATE_LOGGING)
     return;
 
-  net_log_logger_->StopObserving();
+  net_log_logger_->StopObserving(nullptr);
   net_log_logger_.reset();
   state_ = STATE_NOT_LOGGING;
 }
 
 bool NetLogTempFile::GetFilePath(base::FilePath* path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE_USER_BLOCKING));
   if (log_type_ == LOG_TYPE_NONE || state_ == STATE_LOGGING)
     return false;
 
   if (!NetExportLogExists())
@@ skipping 23 matching lines @@
 bool NetLogTempFile::GetNetExportLogDirectory(base::FilePath* path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE_USER_BLOCKING));
   return base::GetTempDir(path);
 }
 
 bool NetLogTempFile::NetExportLogExists() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE_USER_BLOCKING));
   DCHECK(!log_path_.empty());
   return base::PathExists(log_path_);
 }