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

Unified Diff: net/spdy/spdy_session_unittest.cc

Issue 2315613002: Extracted NetLog class's inner enum types into their own enum classes and (Closed)
Patch Set: Ran "git cl format" on code. Much formatting ensued. Created 4 years, 3 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
« no previous file with comments | « net/spdy/spdy_session_pool.cc ('k') | net/spdy/spdy_stream.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_session_unittest.cc
diff --git a/net/spdy/spdy_session_unittest.cc b/net/spdy/spdy_session_unittest.cc
index eb698eb186400a138e0e3590cc92782228762ea7..a03280fcb0615dfdf7580e2b13cb51101cac102c 100644
--- a/net/spdy/spdy_session_unittest.cc
+++ b/net/spdy/spdy_session_unittest.cc
@@ -20,6 +20,7 @@
#include "net/base/test_data_stream.h"
#include "net/base/test_proxy_delegate.h"
#include "net/cert/ct_policy_status.h"
+#include "net/log/net_log_event_type.h"
#include "net/log/test_net_log.h"
#include "net/log/test_net_log_entry.h"
#include "net/log/test_net_log_util.h"
@@ -1535,9 +1536,10 @@ TEST_F(SpdySessionTest, Initialize) {
log_.GetEntries(&entries);
EXPECT_LT(0u, entries.size());
- // Check that we logged TYPE_HTTP2_SESSION_INITIALIZED correctly.
+ // Check that we logged HTTP2_SESSION_INITIALIZED correctly.
int pos = ExpectLogContainsSomewhere(
- entries, 0, NetLog::TYPE_HTTP2_SESSION_INITIALIZED, NetLog::PHASE_NONE);
+ entries, 0, NetLogEventType::HTTP2_SESSION_INITIALIZED,
+ NetLogEventPhase::NONE);
EXPECT_LT(0, pos);
TestNetLogEntry entry = entries[pos];
@@ -1575,8 +1577,9 @@ TEST_F(SpdySessionTest, NetLogOnSessionGoaway) {
log_.GetEntries(&entries);
EXPECT_LT(0u, entries.size());
- int pos = ExpectLogContainsSomewhere(
- entries, 0, NetLog::TYPE_HTTP2_SESSION_GOAWAY, NetLog::PHASE_NONE);
+ int pos = ExpectLogContainsSomewhere(entries, 0,
+ NetLogEventType::HTTP2_SESSION_GOAWAY,
+ NetLogEventPhase::NONE);
TestNetLogEntry entry = entries[pos];
int last_accepted_stream_id;
ASSERT_TRUE(entry.GetIntegerValue("last_accepted_stream_id",
@@ -1596,8 +1599,8 @@ TEST_F(SpdySessionTest, NetLogOnSessionGoaway) {
EXPECT_EQ("foo", debug_data);
// Check that we logged SPDY_SESSION_CLOSE correctly.
- pos = ExpectLogContainsSomewhere(entries, 0, NetLog::TYPE_HTTP2_SESSION_CLOSE,
- NetLog::PHASE_NONE);
+ pos = ExpectLogContainsSomewhere(
+ entries, 0, NetLogEventType::HTTP2_SESSION_CLOSE, NetLogEventPhase::NONE);
entry = entries[pos];
int error_code = 0;
ASSERT_TRUE(entry.GetNetErrorCode(&error_code));
@@ -1631,7 +1634,7 @@ TEST_F(SpdySessionTest, NetLogOnSessionEOF) {
// Check that we logged SPDY_SESSION_CLOSE correctly.
int pos = ExpectLogContainsSomewhere(
- entries, 0, NetLog::TYPE_HTTP2_SESSION_CLOSE, NetLog::PHASE_NONE);
+ entries, 0, NetLogEventType::HTTP2_SESSION_CLOSE, NetLogEventPhase::NONE);
if (pos < static_cast<int>(entries.size())) {
TestNetLogEntry entry = entries[pos];
« no previous file with comments | « net/spdy/spdy_session_pool.cc ('k') | net/spdy/spdy_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698