Refactor NetLog::LogLevel --> NetLogCaptureMode.

net/log/net_log_capture_mode.cc

+// Copyright 2015 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 "net/log/net_log_capture_mode.h"
+
+#include <algorithm>
+
+namespace net {
+
+namespace {
+
+// Integer representation for the capture mode. The numeric value is depended on
+// 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,
+
+  // Log all events, but do not include the actual transferred bytes as
+  // parameters for bytes sent/received events.
+  INCLUDE_COOKIES_AND_CREDENTIALS,
+
+  // Log everything possible, even if it is slow and memory expensive.
+  // Includes logging of transferred bytes.
+  ALL,
+};
+
+}  // namespace
+
+// Default constructor creates an empty capture mode.
+NetLogCaptureMode::NetLogCaptureMode() : NetLogCaptureMode(NONE) {
+}
+
+bool NetLogCaptureMode::enabled() const {

[mmenke, 2015/04/20 15:54:38]

Hrm...Under the old style guide, this naming was only allowed if inlined.  The
new style guide seems less clear on the topic.

[eroman, 2015/04/20 21:07:19]

Acknowledged. I have not made any changes.

+  return value_ != NONE;
+}
+
+bool NetLogCaptureMode::include_private_data() const {
+  return value_ > DEFAULT;

[mmenke, 2015/04/20 15:54:38]

Seems more intuitive to use >= INCLUDE_COOKIES_AND_CREDENTIALS.

[eroman, 2015/04/20 21:07:19]

Done.

+}
+
+bool NetLogCaptureMode::include_socket_bytes() const {
+  return value_ == ALL;

[mmenke, 2015/04/20 15:54:38]

Hrm...  >=?

Don't expect us to include anything more aggressive, but if we ever split up
types of captured bytes or something, seems less regression prone.

[eroman, 2015/04/20 21:07:19]

Done. I also renamed ALL --> INCLUDE_SOCKET_BYTES, since it seemed weird to test
for something greater than ALL. I think this also makes some of the consumers
clearer that the intent is to actually log socket bytes.

+}
+
+NetLogCaptureMode NetLogCaptureMode::Max(NetLogCaptureMode mode1,

[mmenke, 2015/04/20 15:54:38]

All static methods should be prefixed by "// static".

[eroman, 2015/04/20 21:07:19]

I couldn't find any description of this in the style guides. I recognize that a
lot of chrome code does this, but I have gotten feedback from other reviewers
(both in Blink, and in other parts of Chrome code) not to do this. And I agree
with them, // static is something of an empty calorie.

I have left without a // static comment, let me know if you still feel it should
be there.

[mmenke, 2015/04/22 18:52:17]

*Sigh*...Another thing that must have been removed from the style guide when
they updated back when.  They really should have some sort of a changelog (Yea,
it's on SVN, but looking through an SVN diff than includes formatting changes
does not compare to someone bringing your attention to what has actually
changed)

+                                         NetLogCaptureMode mode2) {
+  return NetLogCaptureMode(std::max(mode1.value_, mode2.value_));
+}
+
+NetLogCaptureMode NetLogCaptureMode::None() {
+  return NetLogCaptureMode(NONE);
+}
+
+NetLogCaptureMode NetLogCaptureMode::Default() {
+  return NetLogCaptureMode(DEFAULT);
+}
+
+NetLogCaptureMode NetLogCaptureMode::IncludeCookiesAndCredentials() {
+  return NetLogCaptureMode(INCLUDE_COOKIES_AND_CREDENTIALS);
+}
+
+NetLogCaptureMode NetLogCaptureMode::All() {
+  return NetLogCaptureMode(ALL);
+}
+
+bool NetLogCaptureMode::operator==(NetLogCaptureMode mode) const {
+  return value_ == mode.value_;
+}
+
+NetLogCaptureMode::NetLogCaptureMode(uint32_t value) : value_(value) {
+}
+
+}  // namespace net