Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6504)

Unified Diff: chrome/browser/net/chrome_net_log.cc

Issue 1059843002: Refactor NetLog::LogLevel --> NetLogCaptureMode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add header for std::max Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/net/chrome_net_log.cc
diff --git a/chrome/browser/net/chrome_net_log.cc b/chrome/browser/net/chrome_net_log.cc
index 9cb6aac59784f58d296bbf1a9d05044d22202a3c..261196a4bda5fd546c3757ced138ec2f76392148 100644
--- a/chrome/browser/net/chrome_net_log.cc
+++ b/chrome/browser/net/chrome_net_log.cc
@@ -19,6 +19,46 @@
#include "net/log/net_log_logger.h"
#include "net/log/trace_net_log_observer.h"
+namespace {
+
+bool GetCaptureModeFromCommandLine(const base::CommandLine* command_line,
+ net::NetLogCaptureMode* mode) {
+ // TODO(eroman): The NetLog "capture mode" used to be called the "log
+ // level". To preserve backwards compatibility the log level of old is
+ // converted into a capture mode.
+ if (!command_line->HasSwitch(switches::kNetLogLevel))
+ return false;
+
+ std::string log_level_string =
+ command_line->GetSwitchValueASCII(switches::kNetLogLevel);
+
+ int level;
+ if (!base::StringToInt(log_level_string, &level))
+ return false;
+
+ switch (level) {
+ case 0:
+ *mode = net::NetLogCaptureMode::All();
+ return true;
+ case 1:
+ *mode = net::NetLogCaptureMode::IncludeCookiesAndCredentials();
+ return true;
+ case 2:
+ *mode = net::NetLogCaptureMode::Default();
+ return true;
+ case 3:
+ *mode = net::NetLogCaptureMode::None();
+ return true;
+ default:
+ LOG(ERROR) << "Unrecognized --" << switches::kNetLogLevel;
+ break;
+ }
+
+ return false;
+}
+
+} // namespace
+
ChromeNetLog::ChromeNetLog()
: net_log_temp_file_(new NetLogTempFile(this)) {
const base::CommandLine* command_line =
@@ -46,17 +86,11 @@ ChromeNetLog::ChromeNetLog()
} else {
scoped_ptr<base::Value> constants(NetInternalsUI::GetConstants());
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::NetLogCaptureMode capture_mode;
+ if (GetCaptureModeFromCommandLine(command_line, &capture_mode))
+ net_log_logger_->set_capture_mode(capture_mode);
+
net_log_logger_->StartObserving(this, file.Pass(), constants.get(),
nullptr);
}

Powered by Google App Engine
This is Rietveld 408576698