Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(721)

Unified Diff: net/log/net_log_logger_unittest.cc

Issue 1059843002: Refactor NetLog::LogLevel --> NetLogCaptureMode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add header for std::max Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/log/net_log_logger_unittest.cc
diff --git a/net/log/net_log_logger_unittest.cc b/net/log/net_log_logger_unittest.cc
index 8a0d64a2866d963ab282e7729498c5129006cfb3..314d6e4b4292d643a07b6808c9607dda9be7d6ad 100644
--- a/net/log/net_log_logger_unittest.cc
+++ b/net/log/net_log_logger_unittest.cc
@@ -61,21 +61,23 @@ TEST_F(NetLogLoggerTest, GeneratesValidJSONForNoEvents) {
ASSERT_TRUE(dict->GetDictionary("constants", &constants));
}
-TEST_F(NetLogLoggerTest, LogLevel) {
+TEST_F(NetLogLoggerTest, CaptureMode) {
base::ScopedFILE file(base::OpenFile(log_path_, "w"));
ASSERT_TRUE(file);
NetLogLogger logger;
logger.StartObserving(&net_log_, file.Pass(), nullptr, nullptr);
- EXPECT_EQ(NetLog::LOG_STRIP_PRIVATE_DATA, logger.log_level());
- EXPECT_EQ(NetLog::LOG_STRIP_PRIVATE_DATA, net_log_.GetLogLevel());
+ EXPECT_EQ(NetLogCaptureMode::Default(), logger.capture_mode());
+ EXPECT_EQ(NetLogCaptureMode::Default(), net_log_.GetCaptureMode());
logger.StopObserving(nullptr);
file.reset(base::OpenFile(log_path_, "w"));
ASSERT_TRUE(file);
- logger.set_log_level(NetLog::LOG_ALL_BUT_BYTES);
+ logger.set_capture_mode(NetLogCaptureMode::IncludeCookiesAndCredentials());
logger.StartObserving(&net_log_, file.Pass(), nullptr, nullptr);
- EXPECT_EQ(NetLog::LOG_ALL_BUT_BYTES, logger.log_level());
- EXPECT_EQ(NetLog::LOG_ALL_BUT_BYTES, net_log_.GetLogLevel());
+ EXPECT_EQ(NetLogCaptureMode::IncludeCookiesAndCredentials(),
+ logger.capture_mode());
+ EXPECT_EQ(NetLogCaptureMode::IncludeCookiesAndCredentials(),
+ net_log_.GetCaptureMode());
logger.StopObserving(nullptr);
}
@@ -90,7 +92,7 @@ TEST_F(NetLogLoggerTest, GeneratesValidJSONWithOneEvent) {
NetLog::EntryData entry_data(NetLog::TYPE_PROXY_SERVICE, source,
NetLog::PHASE_BEGIN, base::TimeTicks::Now(),
NULL);
- NetLog::Entry entry(&entry_data, NetLog::LOG_ALL);
+ NetLog::Entry entry(&entry_data, NetLogCaptureMode::All());
logger->OnAddEntry(entry);
logger->StopObserving(nullptr);
logger.reset();
@@ -120,7 +122,7 @@ TEST_F(NetLogLoggerTest, GeneratesValidJSONWithMultipleEvents) {
NetLog::EntryData entry_data(NetLog::TYPE_PROXY_SERVICE, source,
NetLog::PHASE_BEGIN, base::TimeTicks::Now(),
NULL);
- NetLog::Entry entry(&entry_data, NetLog::LOG_ALL);
+ NetLog::Entry entry(&entry_data, NetLogCaptureMode::All());
// Add the entry multiple times.
logger->OnAddEntry(entry);

Powered by Google App Engine
This is Rietveld 408576698