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

Unified Diff: net/log/net_log_unittest.cc

Issue 2333923004: Extracting NetLog inner classes into their own classes. (Closed)
Patch Set: Some nit fixes and better, impl-agnostic naming of net_log_parameters_callback_typedef.h -> net/log… Created 4 years, 2 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_unittest.cc
diff --git a/net/log/net_log_unittest.cc b/net/log/net_log_unittest.cc
index d321b1ac2e5356c6e001cf433d6fe130e674bb52..4e67951b2666af4bda3f2503b72b28adcfbcb0bd 100644
--- a/net/log/net_log_unittest.cc
+++ b/net/log/net_log_unittest.cc
@@ -66,7 +66,7 @@ TEST(NetLogTest, Basic) {
ASSERT_EQ(1u, entries.size());
EXPECT_EQ(NetLogEventType::CANCELLED, entries[0].type);
EXPECT_EQ(NetLogSourceType::NONE, entries[0].source.type);
- EXPECT_NE(NetLog::Source::kInvalidId, entries[0].source.id);
+ EXPECT_NE(NetLogSource::kInvalidId, entries[0].source.id);
EXPECT_EQ(NetLogEventPhase::NONE, entries[0].phase);
EXPECT_GE(base::TimeTicks::Now(), entries[0].time);
EXPECT_FALSE(entries[0].params);
@@ -95,7 +95,7 @@ TEST(NetLogTest, CaptureModes) {
ASSERT_EQ(1u, entries.size());
EXPECT_EQ(NetLogEventType::SOCKET_ALIVE, entries[0].type);
EXPECT_EQ(NetLogSourceType::NONE, entries[0].source.type);
- EXPECT_NE(NetLog::Source::kInvalidId, entries[0].source.id);
+ EXPECT_NE(NetLogSource::kInvalidId, entries[0].source.id);
EXPECT_EQ(NetLogEventPhase::NONE, entries[0].phase);
EXPECT_GE(base::TimeTicks::Now(), entries[0].time);
@@ -117,7 +117,7 @@ class CountingObserver : public NetLog::ThreadSafeObserver {
net_log()->DeprecatedRemoveObserver(this);
}
- void OnAddEntry(const NetLog::Entry& entry) override { ++count_; }
+ void OnAddEntry(const NetLogEntry& entry) override { ++count_; }
int count() const { return count_; }
@@ -134,7 +134,7 @@ class LoggingObserver : public NetLog::ThreadSafeObserver {
net_log()->DeprecatedRemoveObserver(this);
}
- void OnAddEntry(const NetLog::Entry& entry) override {
+ void OnAddEntry(const NetLogEntry& entry) override {
std::unique_ptr<base::DictionaryValue> dict =
base::DictionaryValue::From(entry.ToValue());
ASSERT_TRUE(dict);

Powered by Google App Engine
This is Rietveld 408576698