Remove NetLog::GetCaptureMode() and NetLogCaptureMode::None()

net/log/net_log_capture_mode_unittest.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 "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
 namespace {
 
-TEST(NetLogCaptureMode, None) {
-  NetLogCaptureMode mode = NetLogCaptureMode::None();
-
-  EXPECT_FALSE(mode.enabled());
-  EXPECT_FALSE(mode.include_cookies_and_credentials());
-  EXPECT_FALSE(mode.include_socket_bytes());
-
-  EXPECT_EQ(mode, NetLogCaptureMode::None());
-  EXPECT_NE(mode, NetLogCaptureMode::Default());
-  EXPECT_NE(mode, NetLogCaptureMode::IncludeCookiesAndCredentials());
-  EXPECT_NE(mode, NetLogCaptureMode::IncludeSocketBytes());
-  EXPECT_EQ(mode.ToInternalValueForTesting(),
-            NetLogCaptureMode::None().ToInternalValueForTesting());
+TEST(NetLogCaptureMode, DefaultConstructor) {
+  EXPECT_EQ(NetLogCaptureMode(), NetLogCaptureMode::Default());
 }
 
 TEST(NetLogCaptureMode, Default) {
   NetLogCaptureMode mode = NetLogCaptureMode::Default();
 
-  EXPECT_TRUE(mode.enabled());
   EXPECT_FALSE(mode.include_cookies_and_credentials());
   EXPECT_FALSE(mode.include_socket_bytes());
 
-  EXPECT_NE(mode, NetLogCaptureMode::None());
   EXPECT_EQ(mode, NetLogCaptureMode::Default());
   EXPECT_NE(mode, NetLogCaptureMode::IncludeCookiesAndCredentials());
   EXPECT_NE(mode, NetLogCaptureMode::IncludeSocketBytes());
   EXPECT_EQ(mode.ToInternalValueForTesting(),
             NetLogCaptureMode::Default().ToInternalValueForTesting());

[mmenke, 2015/05/06 15:14:42]

Hrm...Do we even care about testing this any more?  Now that we just copy them,
and have nothing more complicated, we may be able to just get rid of
ToInternalValueForTesting(), unless you think we'll be doing something more
complicated in the future.

[eroman, 2015/05/06 17:01:04]

We can get rid of ToInternalValueForTesting() but it will require massaging
net_log_unittest.cc into compliance. I will leave this to a follow-up CL.

 }
 
 TEST(NetLogCaptureMode, IncludeCookiesAndCredentials) {
   NetLogCaptureMode mode = NetLogCaptureMode::IncludeCookiesAndCredentials();
 
-  EXPECT_TRUE(mode.enabled());
   EXPECT_TRUE(mode.include_cookies_and_credentials());
   EXPECT_FALSE(mode.include_socket_bytes());
 
-  EXPECT_NE(mode, NetLogCaptureMode::None());
   EXPECT_NE(mode, NetLogCaptureMode::Default());
   EXPECT_EQ(mode, NetLogCaptureMode::IncludeCookiesAndCredentials());
   EXPECT_NE(mode, NetLogCaptureMode::IncludeSocketBytes());
   EXPECT_EQ(mode.ToInternalValueForTesting(),
             NetLogCaptureMode::IncludeCookiesAndCredentials()
                 .ToInternalValueForTesting());
 }
 
 TEST(NetLogCaptureMode, IncludeSocketBytes) {
   NetLogCaptureMode mode = NetLogCaptureMode::IncludeSocketBytes();
 
-  EXPECT_TRUE(mode.enabled());
   EXPECT_TRUE(mode.include_cookies_and_credentials());
   EXPECT_TRUE(mode.include_socket_bytes());
 
-  EXPECT_NE(mode, NetLogCaptureMode::None());
   EXPECT_NE(mode, NetLogCaptureMode::Default());
   EXPECT_NE(mode, NetLogCaptureMode::IncludeCookiesAndCredentials());
   EXPECT_EQ(mode, NetLogCaptureMode::IncludeSocketBytes());
   EXPECT_EQ(
       mode.ToInternalValueForTesting(),
       NetLogCaptureMode::IncludeSocketBytes().ToInternalValueForTesting());
 }
 
-TEST(NetLogCaptureMode, Max) {
-  NetLogCaptureMode none = NetLogCaptureMode::None();
-  NetLogCaptureMode all = NetLogCaptureMode::IncludeSocketBytes();
-  NetLogCaptureMode cookies = NetLogCaptureMode::IncludeCookiesAndCredentials();
-  NetLogCaptureMode def = NetLogCaptureMode::Default();
-
-  EXPECT_EQ(all, NetLogCaptureMode::Max(none, all));
-  EXPECT_EQ(all, NetLogCaptureMode::Max(all, none));
-
-  EXPECT_EQ(cookies, NetLogCaptureMode::Max(def, cookies));
-  EXPECT_EQ(cookies, NetLogCaptureMode::Max(cookies, def));
-
-  EXPECT_EQ(all, NetLogCaptureMode::Max(def, all));
-  EXPECT_EQ(all, NetLogCaptureMode::Max(all, def));
-}
-
 }  // namespace
 
 }  // namespace net