Import cobalt 25.master.0.1034729
diff --git a/net/log/net_log_capture_mode_unittest.cc b/net/log/net_log_capture_mode_unittest.cc
index a249bf1..dc381ba 100644
--- a/net/log/net_log_capture_mode_unittest.cc
+++ b/net/log/net_log_capture_mode_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
+// Copyright 2015 The Chromium Authors
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -10,41 +10,25 @@
namespace {
-TEST(NetLogCaptureMode, DefaultConstructor) {
- EXPECT_EQ(NetLogCaptureMode(), NetLogCaptureMode::Default());
-}
-
TEST(NetLogCaptureMode, Default) {
- NetLogCaptureMode mode = NetLogCaptureMode::Default();
+ NetLogCaptureMode mode = NetLogCaptureMode::kDefault;
- EXPECT_FALSE(mode.include_cookies_and_credentials());
- EXPECT_FALSE(mode.include_socket_bytes());
-
- EXPECT_EQ(mode, NetLogCaptureMode::Default());
- EXPECT_NE(mode, NetLogCaptureMode::IncludeCookiesAndCredentials());
- EXPECT_NE(mode, NetLogCaptureMode::IncludeSocketBytes());
+ EXPECT_FALSE(NetLogCaptureIncludesSensitive(mode));
+ EXPECT_FALSE(NetLogCaptureIncludesSocketBytes(mode));
}
-TEST(NetLogCaptureMode, IncludeCookiesAndCredentials) {
- NetLogCaptureMode mode = NetLogCaptureMode::IncludeCookiesAndCredentials();
+TEST(NetLogCaptureMode, IncludeSensitive) {
+ NetLogCaptureMode mode = NetLogCaptureMode::kIncludeSensitive;
- EXPECT_TRUE(mode.include_cookies_and_credentials());
- EXPECT_FALSE(mode.include_socket_bytes());
-
- EXPECT_NE(mode, NetLogCaptureMode::Default());
- EXPECT_EQ(mode, NetLogCaptureMode::IncludeCookiesAndCredentials());
- EXPECT_NE(mode, NetLogCaptureMode::IncludeSocketBytes());
+ EXPECT_TRUE(NetLogCaptureIncludesSensitive(mode));
+ EXPECT_FALSE(NetLogCaptureIncludesSocketBytes(mode));
}
-TEST(NetLogCaptureMode, IncludeSocketBytes) {
- NetLogCaptureMode mode = NetLogCaptureMode::IncludeSocketBytes();
+TEST(NetLogCaptureMode, Everything) {
+ NetLogCaptureMode mode = NetLogCaptureMode::kEverything;
- EXPECT_TRUE(mode.include_cookies_and_credentials());
- EXPECT_TRUE(mode.include_socket_bytes());
-
- EXPECT_NE(mode, NetLogCaptureMode::Default());
- EXPECT_NE(mode, NetLogCaptureMode::IncludeCookiesAndCredentials());
- EXPECT_EQ(mode, NetLogCaptureMode::IncludeSocketBytes());
+ EXPECT_TRUE(NetLogCaptureIncludesSensitive(mode));
+ EXPECT_TRUE(NetLogCaptureIncludesSocketBytes(mode));
}
} // namespace
