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

Unified Diff: net/log/net_log_capture_mode.cc

Issue 1122483004: Remove NetLog::GetCaptureMode() and NetLogCaptureMode::None() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mmenke_refactor
Patch Set: second attempt at fixing int --> bool warning on windows Created 5 years, 7 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
« no previous file with comments | « net/log/net_log_capture_mode.h ('k') | net/log/net_log_capture_mode_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/log/net_log_capture_mode.cc
diff --git a/net/log/net_log_capture_mode.cc b/net/log/net_log_capture_mode.cc
index 501911e0a9b6dc7b063e219350919942276a54e9..8ac365f02c42230259fd305f48dcf19ad5661985 100644
--- a/net/log/net_log_capture_mode.cc
+++ b/net/log/net_log_capture_mode.cc
@@ -14,9 +14,6 @@ namespace {
// for method of NetLogCaptureMode, which expect that higher values imply more
// capabilities.
enum InternalValue {
- // Don't log any events.
- NONE,
-
// Log all events, but do not include the actual transferred bytes and
// remove cookies and HTTP credentials.
DEFAULT,
@@ -32,12 +29,7 @@ enum InternalValue {
} // namespace
-// Default constructor creates an empty capture mode.
-NetLogCaptureMode::NetLogCaptureMode() : NetLogCaptureMode(NONE) {
-}
-
-NetLogCaptureMode NetLogCaptureMode::None() {
- return NetLogCaptureMode(NONE);
+NetLogCaptureMode::NetLogCaptureMode() : NetLogCaptureMode(DEFAULT) {
}
NetLogCaptureMode NetLogCaptureMode::Default() {
@@ -52,15 +44,6 @@ NetLogCaptureMode NetLogCaptureMode::IncludeSocketBytes() {
return NetLogCaptureMode(INCLUDE_SOCKET_BYTES);
}
-NetLogCaptureMode NetLogCaptureMode::Max(NetLogCaptureMode mode1,
- NetLogCaptureMode mode2) {
- return NetLogCaptureMode(std::max(mode1.value_, mode2.value_));
-}
-
-bool NetLogCaptureMode::enabled() const {
- return value_ != NONE;
-}
-
bool NetLogCaptureMode::include_cookies_and_credentials() const {
return value_ >= INCLUDE_COOKIES_AND_CREDENTIALS;
}
@@ -78,18 +61,10 @@ bool NetLogCaptureMode::operator!=(NetLogCaptureMode mode) const {
}
int32_t NetLogCaptureMode::ToInternalValueForTesting() const {
- return ToInternalValue();
+ return value_;
}
NetLogCaptureMode::NetLogCaptureMode(uint32_t value) : value_(value) {
}
-NetLogCaptureMode NetLogCaptureMode::FromInternalValue(int32_t value) {
- return NetLogCaptureMode(value);
-}
-
-int32_t NetLogCaptureMode::ToInternalValue() const {
- return value_;
-}
-
} // namespace net
« no previous file with comments | « net/log/net_log_capture_mode.h ('k') | net/log/net_log_capture_mode_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698