summaryrefslogtreecommitdiffstats
path: root/net/tools/gdig/gdig.cc
diff options
context:
space:
mode:
authoreroman <eroman@chromium.org>2015-04-22 20:11:17 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-23 03:11:23 +0000
commit001c374c5356777641161bb11b8dd792508381ca (patch)
tree90ed1b55c3ab4a7aa3d09bb205c6e23035817d22 /net/tools/gdig/gdig.cc
parent14ccb93f5f75f388b6a6b4a9c1eb434f61dbbfef (diff)
downloadchromium_src-001c374c5356777641161bb11b8dd792508381ca.zip
chromium_src-001c374c5356777641161bb11b8dd792508381ca.tar.gz
chromium_src-001c374c5356777641161bb11b8dd792508381ca.tar.bz2
Refactor NetLog::LogLevel --> NetLogCaptureMode.
This is both a rename, and a functional change. Before LogLevel was an enum, and consumers would compare its numeric value, or use it for serialization purposes. Whereas NetLogCaptureMode is a class that encapsulates the various capabilities for a logging level. BUG=472710 TBR=asanka@chromium.org,sergeyu@chromium.org,yurys@chromium.org,bengr@chromium.org,asargent@chromium.org,zea@chromium.org,scherkus@chromium.org Review URL: https://codereview.chromium.org/1059843002 Cr-Commit-Position: refs/heads/master@{#326440}
Diffstat (limited to 'net/tools/gdig/gdig.cc')
-rw-r--r--net/tools/gdig/gdig.cc16
1 files changed, 9 insertions, 7 deletions
diff --git a/net/tools/gdig/gdig.cc b/net/tools/gdig/gdig.cc
index faaffa7..285668b 100644
--- a/net/tools/gdig/gdig.cc
+++ b/net/tools/gdig/gdig.cc
@@ -296,15 +296,17 @@ bool GDig::ParseCommandLine(int argc, const char* argv[]) {
if (parsed_command_line.HasSwitch("net_log")) {
std::string log_param = parsed_command_line.GetSwitchValueASCII("net_log");
- NetLog::LogLevel level = NetLog::LOG_ALL_BUT_BYTES;
+ NetLogCaptureMode capture_mode =
+ NetLogCaptureMode::IncludeCookiesAndCredentials();
if (log_param.length() > 0) {
- std::map<std::string, NetLog::LogLevel> log_levels;
- log_levels["all"] = NetLog::LOG_ALL;
- log_levels["no_bytes"] = NetLog::LOG_ALL_BUT_BYTES;
+ std::map<std::string, NetLogCaptureMode> capture_modes;
+ capture_modes["all"] = NetLogCaptureMode::IncludeSocketBytes();
+ capture_modes["no_bytes"] =
+ NetLogCaptureMode::IncludeCookiesAndCredentials();
- if (log_levels.find(log_param) != log_levels.end()) {
- level = log_levels[log_param];
+ if (capture_modes.find(log_param) != capture_modes.end()) {
+ capture_mode = capture_modes[log_param];
} else {
fprintf(stderr, "Invalid net_log parameter\n");
return false;
@@ -312,7 +314,7 @@ bool GDig::ParseCommandLine(int argc, const char* argv[]) {
}
log_.reset(new NetLog);
log_observer_.reset(new FileNetLogObserver(stderr));
- log_->DeprecatedAddObserver(log_observer_.get(), level);
+ log_->DeprecatedAddObserver(log_observer_.get(), capture_mode);
}
print_config_ = parsed_command_line.HasSwitch("print_config");