summaryrefslogtreecommitdiffstats
path: root/chrome/browser/net
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/net')
-rw-r--r--chrome/browser/net/chrome_net_log.cc4
-rw-r--r--chrome/browser/net/chrome_net_log.h4
-rw-r--r--chrome/browser/net/net_log_temp_file.cc4
-rw-r--r--chrome/browser/net/net_log_temp_file.h4
4 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/net/chrome_net_log.cc b/chrome/browser/net/chrome_net_log.cc
index 9cb6aac..1dda8cce 100644
--- a/chrome/browser/net/chrome_net_log.cc
+++ b/chrome/browser/net/chrome_net_log.cc
@@ -16,8 +16,8 @@
#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/log/net_log_logger.h"
#include "net/log/trace_net_log_observer.h"
+#include "net/log/write_to_file_net_log_observer.h"
ChromeNetLog::ChromeNetLog()
: net_log_temp_file_(new NetLogTempFile(this)) {
@@ -45,7 +45,7 @@ ChromeNetLog::ChromeNetLog()
<< " for net logging";
} else {
scoped_ptr<base::Value> constants(NetInternalsUI::GetConstants());
- net_log_logger_.reset(new net::NetLogLogger());
+ net_log_logger_.reset(new net::WriteToFileNetLogObserver());
if (command_line->HasSwitch(switches::kNetLogLevel)) {
std::string log_level_string =
command_line->GetSwitchValueASCII(switches::kNetLogLevel);
diff --git a/chrome/browser/net/chrome_net_log.h b/chrome/browser/net/chrome_net_log.h
index 6018000..ad4c4b0 100644
--- a/chrome/browser/net/chrome_net_log.h
+++ b/chrome/browser/net/chrome_net_log.h
@@ -12,7 +12,7 @@
#include "net/log/net_log.h"
namespace net {
-class NetLogLogger;
+class WriteToFileNetLogObserver;
class TraceNetLogObserver;
}
@@ -30,7 +30,7 @@ class ChromeNetLog : public net::NetLog {
}
private:
- scoped_ptr<net::NetLogLogger> net_log_logger_;
+ scoped_ptr<net::WriteToFileNetLogObserver> net_log_logger_;
scoped_ptr<NetLogTempFile> net_log_temp_file_;
scoped_ptr<net::TraceNetLogObserver> trace_net_log_observer_;
diff --git a/chrome/browser/net/net_log_temp_file.cc b/chrome/browser/net/net_log_temp_file.cc
index 1da33e6..3674b2b 100644
--- a/chrome/browser/net/net_log_temp_file.cc
+++ b/chrome/browser/net/net_log_temp_file.cc
@@ -10,7 +10,7 @@
#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/log/net_log_logger.h"
+#include "net/log/write_to_file_net_log_observer.h"
using content::BrowserThread;
@@ -144,7 +144,7 @@ void NetLogTempFile::StartNetLog(LogType log_type) {
state_ = STATE_LOGGING;
scoped_ptr<base::Value> constants(NetInternalsUI::GetConstants());
- net_log_logger_.reset(new net::NetLogLogger());
+ net_log_logger_.reset(new net::WriteToFileNetLogObserver());
net_log_logger_->set_log_level(GetLogLevelForLogType(log_type));
net_log_logger_->StartObserving(chrome_net_log_, file.Pass(), constants.get(),
nullptr);
diff --git a/chrome/browser/net/net_log_temp_file.h b/chrome/browser/net/net_log_temp_file.h
index 3f2c2c7..46598e3 100644
--- a/chrome/browser/net/net_log_temp_file.h
+++ b/chrome/browser/net/net_log_temp_file.h
@@ -18,7 +18,7 @@ class DictionaryValue;
}
namespace net {
-class NetLogLogger;
+class WriteToFileNetLogObserver;
}
class ChromeNetLog;
@@ -152,7 +152,7 @@ class NetLogTempFile {
// |net_log_logger_| watches the NetLog event stream, and sends all entries to
// the file created in StartNetLog().
- scoped_ptr<net::NetLogLogger> net_log_logger_;
+ scoped_ptr<net::WriteToFileNetLogObserver> net_log_logger_;
// The |chrome_net_log_| is owned by the browser process, cached here to avoid
// using global (g_browser_process).