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

chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.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/ui/webui/net_internals/net_internals_ui_browsertest.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
+#include "base/files/scoped_file.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 248 matching lines @@
   incognito_browser_ = NULL;
 }
 
 void NetInternalsTest::MessageHandler::GetNetLogLoggerLog(
     const base::ListValue* list_value) {
   base::ScopedTempDir temp_directory;
   ASSERT_TRUE(temp_directory.CreateUniqueTempDir());
   base::FilePath temp_file;
   ASSERT_TRUE(base::CreateTemporaryFileInDir(temp_directory.path(),
                                              &temp_file));
-  FILE* temp_file_handle = base::OpenFile(temp_file, "w");
+  base::ScopedFILE temp_file_handle(base::OpenFile(temp_file, "w"));
   ASSERT_TRUE(temp_file_handle);
 
   scoped_ptr<base::Value> constants(NetInternalsUI::GetConstants());
-  scoped_ptr<net::NetLogLogger> net_log_logger(new net::NetLogLogger(
-      temp_file_handle, *constants));
-  net_log_logger->StartObserving(g_browser_process->net_log());
+  scoped_ptr<net::NetLogLogger> net_log_logger(new net::NetLogLogger());
+  net_log_logger->StartObserving(
+      g_browser_process->net_log(), temp_file_handle.Pass(), constants.get(),
+      nullptr);
   g_browser_process->net_log()->AddGlobalEntry(
       net::NetLog::TYPE_NETWORK_IP_ADDRESSES_CHANGED);
   net::BoundNetLog bound_net_log = net::BoundNetLog::Make(
       g_browser_process->net_log(),
       net::NetLog::SOURCE_URL_REQUEST);
   bound_net_log.BeginEvent(net::NetLog::TYPE_REQUEST_ALIVE);
-  net_log_logger->StopObserving();
+  net_log_logger->StopObserving(nullptr);
   net_log_logger.reset();
 
   std::string log_contents;
   ASSERT_TRUE(base::ReadFileToString(temp_file, &log_contents));
   ASSERT_GT(log_contents.length(), 0u);
 
   scoped_ptr<base::Value> log_contents_value(
       new base::StringValue(log_contents));
   RunJavascriptCallback(log_contents_value.get());
 }
@@ skipping 58 matching lines @@
   if (test_server_started_)
     return true;
   test_server_started_ = test_server()->Start();
 
   // Sample domain for SDCH-view test. Dictionaries for localhost/127.0.0.1
   // are forbidden.
   host_resolver()->AddRule("testdomain.com", "127.0.0.1");
   host_resolver()->AddRule("sub.testdomain.com", "127.0.0.1");
   return test_server_started_;
 }