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

net/log/net_log_unittest.cc

Index: net/log/net_log_unittest.cc
diff --git a/net/log/net_log_unittest.cc b/net/log/net_log_unittest.cc
index 26e71ce4418b9baccd97168e64c88215a6c601ba..a87e8a6a45204f8a5fc32e908f42be9e413612e9 100644
--- a/net/log/net_log_unittest.cc
+++ b/net/log/net_log_unittest.cc
@@ -261,16 +261,15 @@ TEST(NetLogTest, NetLogAddRemoveObserver) {
   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());
@@ -280,7 +279,6 @@ TEST(NetLogTest, NetLogAddRemoveObserver) {
                                  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());
@@ -288,7 +286,7 @@ TEST(NetLogTest, NetLogAddRemoveObserver) {
   // 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());
@@ -298,7 +296,6 @@ TEST(NetLogTest, NetLogAddRemoveObserver) {
                                 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());
@@ -316,8 +313,6 @@ TEST(NetLogTest, NetLogTwoObservers) {
   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],
@@ -328,7 +323,6 @@ TEST(NetLogTest, NetLogTwoObservers) {
             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.
@@ -347,8 +341,6 @@ TEST(NetLogTest, NetLogTwoObservers) {
   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);
@@ -359,7 +351,7 @@ TEST(NetLogTest, NetLogTwoObservers) {
   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);