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

net/log/net_log_unittest.cc

 // Copyright (c) 2013 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.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_vector.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/simple_thread.h"
@@ skipping 243 matching lines @@
 }
 
 // Test adding and removing a single observer.
 TEST(NetLogTest, NetLogAddRemoveObserver) {
   NetLog net_log;
   CountingObserver observer;
 
   AddEvent(&net_log);
   EXPECT_EQ(0, observer.count());
   EXPECT_EQ(NULL, observer.net_log());
-  EXPECT_FALSE(net_log.GetCaptureMode().enabled());
+  EXPECT_FALSE(net_log.IsCapturing());
 
   // Add the observer and add an event.
   net_log.DeprecatedAddObserver(
       &observer, NetLogCaptureMode::IncludeCookiesAndCredentials());
+  EXPECT_TRUE(net_log.IsCapturing());
   EXPECT_EQ(&net_log, observer.net_log());
   EXPECT_EQ(NetLogCaptureMode::IncludeCookiesAndCredentials(),
             observer.capture_mode());
-  EXPECT_EQ(NetLogCaptureMode::IncludeCookiesAndCredentials(),
-            net_log.GetCaptureMode());
 
   AddEvent(&net_log);
   EXPECT_EQ(1, observer.count());
 
   // Change the observer's logging level and add an event.
   net_log.SetObserverCaptureMode(&observer,
                                  NetLogCaptureMode::IncludeSocketBytes());
   EXPECT_EQ(&net_log, observer.net_log());
   EXPECT_EQ(NetLogCaptureMode::IncludeSocketBytes(), observer.capture_mode());
-  EXPECT_EQ(NetLogCaptureMode::IncludeSocketBytes(), net_log.GetCaptureMode());
 
   AddEvent(&net_log);
   EXPECT_EQ(2, observer.count());
 
   // Remove observer and add an event.
   net_log.DeprecatedRemoveObserver(&observer);
   EXPECT_EQ(NULL, observer.net_log());
-  EXPECT_FALSE(net_log.GetCaptureMode().enabled());
+  EXPECT_FALSE(net_log.IsCapturing());
 
   AddEvent(&net_log);
   EXPECT_EQ(2, observer.count());
 
   // Add the observer a final time, and add an event.
   net_log.DeprecatedAddObserver(&observer,
                                 NetLogCaptureMode::IncludeSocketBytes());
   EXPECT_EQ(&net_log, observer.net_log());
   EXPECT_EQ(NetLogCaptureMode::IncludeSocketBytes(), observer.capture_mode());
-  EXPECT_EQ(NetLogCaptureMode::IncludeSocketBytes(), net_log.GetCaptureMode());
 
   AddEvent(&net_log);
   EXPECT_EQ(3, observer.count());
 }
 
 // Test adding and removing two observers at different log levels.
 TEST(NetLogTest, NetLogTwoObservers) {
   NetLog net_log;
   LoggingObserver observer[2];
 
   // Add first observer.
   net_log.DeprecatedAddObserver(
       &observer[0], NetLogCaptureMode::IncludeCookiesAndCredentials());
   EXPECT_EQ(&net_log, observer[0].net_log());
   EXPECT_EQ(NULL, observer[1].net_log());
   EXPECT_EQ(NetLogCaptureMode::IncludeCookiesAndCredentials(),
             observer[0].capture_mode());
-  EXPECT_EQ(NetLogCaptureMode::IncludeCookiesAndCredentials(),
-            net_log.GetCaptureMode());
 
   // Add second observer observer.
   net_log.DeprecatedAddObserver(&observer[1],
                                 NetLogCaptureMode::IncludeSocketBytes());
   EXPECT_EQ(&net_log, observer[0].net_log());
   EXPECT_EQ(&net_log, observer[1].net_log());
   EXPECT_EQ(NetLogCaptureMode::IncludeCookiesAndCredentials(),
             observer[0].capture_mode());
   EXPECT_EQ(NetLogCaptureMode::IncludeSocketBytes(),
             observer[1].capture_mode());
-  EXPECT_EQ(NetLogCaptureMode::IncludeSocketBytes(), net_log.GetCaptureMode());
 
   // Add event and make sure both observers receive it at their respective log
   // levels.
   int param;
   AddEvent(&net_log);
   ASSERT_EQ(1U, observer[0].GetNumValues());
   ASSERT_TRUE(observer[0].GetValue(0)->GetInteger("params", &param));
   EXPECT_EQ(observer[0].capture_mode().ToInternalValueForTesting(), param);
   ASSERT_EQ(1U, observer[1].GetNumValues());
   ASSERT_TRUE(observer[1].GetValue(0)->GetInteger("params", &param));
   EXPECT_EQ(observer[1].capture_mode().ToInternalValueForTesting(), param);
 
   // Remove second observer.
   net_log.DeprecatedRemoveObserver(&observer[1]);
   EXPECT_EQ(&net_log, observer[0].net_log());
   EXPECT_EQ(NULL, observer[1].net_log());
   EXPECT_EQ(NetLogCaptureMode::IncludeCookiesAndCredentials(),
             observer[0].capture_mode());
-  EXPECT_EQ(NetLogCaptureMode::IncludeCookiesAndCredentials(),
-            net_log.GetCaptureMode());

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

optoinal:  May want to replace all of these with IsCapturing(), out of paranoia.

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

Done.

 
   // Add event and make sure only second observer gets it.
   AddEvent(&net_log);
   EXPECT_EQ(2U, observer[0].GetNumValues());
   EXPECT_EQ(1U, observer[1].GetNumValues());
 
   // Remove first observer.
   net_log.DeprecatedRemoveObserver(&observer[0]);
   EXPECT_EQ(NULL, observer[0].net_log());
   EXPECT_EQ(NULL, observer[1].net_log());
-  EXPECT_FALSE(net_log.GetCaptureMode().enabled());
+  EXPECT_FALSE(net_log.IsCapturing());
 
   // Add event and make sure neither observer gets it.
   AddEvent(&net_log);
   EXPECT_EQ(2U, observer[0].GetNumValues());
   EXPECT_EQ(1U, observer[1].GetNumValues());
 }
 
 // Makes sure that adding and removing observers simultaneously on different
 // threads works.
 TEST(NetLogTest, NetLogAddRemoveObserverThreads) {
   NetLog net_log;
 
   // Run a bunch of threads to completion, each of which will repeatedly add
   // and remove an observer, and set its logging level.
   RunTestThreads<AddRemoveObserverTestThread>(&net_log);
 }
 
 }  // namespace
 
 }  // namespace net