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

Unified Diff: net/spdy/spdy_proxy_client_socket_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_proxy_client_socket.cc ('k') | net/spdy/spdy_session.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_proxy_client_socket_unittest.cc
diff --git a/net/spdy/spdy_proxy_client_socket_unittest.cc b/net/spdy/spdy_proxy_client_socket_unittest.cc
index 0267264b5728e29d4b156f2d48f800cf7159a916..95bd14a1409c2a6095079c6c5e89e38c48bde04a 100644
--- a/net/spdy/spdy_proxy_client_socket_unittest.cc
+++ b/net/spdy/spdy_proxy_client_socket_unittest.cc
@@ -18,6 +18,7 @@
#include "net/http/http_response_headers.h"
#include "net/http/http_response_info.h"
#include "net/log/net_log.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"
@@ -1252,28 +1253,31 @@ TEST_F(SpdyProxyClientSocketTest, NetLog) {
net_log_.GetEntriesForSource(sock_source, &entry_list);
ASSERT_EQ(entry_list.size(), 10u);
- EXPECT_TRUE(LogContainsBeginEvent(entry_list, 0, NetLog::TYPE_SOCKET_ALIVE));
+ EXPECT_TRUE(
+ LogContainsBeginEvent(entry_list, 0, NetLogEventType::SOCKET_ALIVE));
EXPECT_TRUE(LogContainsEvent(entry_list, 1,
- NetLog::TYPE_HTTP2_PROXY_CLIENT_SESSION,
- NetLog::PHASE_NONE));
- EXPECT_TRUE(LogContainsBeginEvent(entry_list, 2,
- NetLog::TYPE_HTTP_TRANSACTION_TUNNEL_SEND_REQUEST));
- EXPECT_TRUE(LogContainsEvent(entry_list, 3,
- NetLog::TYPE_HTTP_TRANSACTION_SEND_TUNNEL_HEADERS,
- NetLog::PHASE_NONE));
- EXPECT_TRUE(LogContainsEndEvent(entry_list, 4,
- NetLog::TYPE_HTTP_TRANSACTION_TUNNEL_SEND_REQUEST));
- EXPECT_TRUE(LogContainsBeginEvent(entry_list, 5,
- NetLog::TYPE_HTTP_TRANSACTION_TUNNEL_READ_HEADERS));
- EXPECT_TRUE(LogContainsEvent(entry_list, 6,
- NetLog::TYPE_HTTP_TRANSACTION_READ_TUNNEL_RESPONSE_HEADERS,
- NetLog::PHASE_NONE));
- EXPECT_TRUE(LogContainsEndEvent(entry_list, 7,
- NetLog::TYPE_HTTP_TRANSACTION_TUNNEL_READ_HEADERS));
+ NetLogEventType::HTTP2_PROXY_CLIENT_SESSION,
+ NetLogEventPhase::NONE));
+ EXPECT_TRUE(LogContainsBeginEvent(
+ entry_list, 2, NetLogEventType::HTTP_TRANSACTION_TUNNEL_SEND_REQUEST));
+ EXPECT_TRUE(LogContainsEvent(
+ entry_list, 3, NetLogEventType::HTTP_TRANSACTION_SEND_TUNNEL_HEADERS,
+ NetLogEventPhase::NONE));
+ EXPECT_TRUE(LogContainsEndEvent(
+ entry_list, 4, NetLogEventType::HTTP_TRANSACTION_TUNNEL_SEND_REQUEST));
+ EXPECT_TRUE(LogContainsBeginEvent(
+ entry_list, 5, NetLogEventType::HTTP_TRANSACTION_TUNNEL_READ_HEADERS));
+ EXPECT_TRUE(LogContainsEvent(
+ entry_list, 6,
+ NetLogEventType::HTTP_TRANSACTION_READ_TUNNEL_RESPONSE_HEADERS,
+ NetLogEventPhase::NONE));
+ EXPECT_TRUE(LogContainsEndEvent(
+ entry_list, 7, NetLogEventType::HTTP_TRANSACTION_TUNNEL_READ_HEADERS));
EXPECT_TRUE(LogContainsEvent(entry_list, 8,
- NetLog::TYPE_SOCKET_BYTES_RECEIVED,
- NetLog::PHASE_NONE));
- EXPECT_TRUE(LogContainsEndEvent(entry_list, 9, NetLog::TYPE_SOCKET_ALIVE));
+ NetLogEventType::SOCKET_BYTES_RECEIVED,
+ NetLogEventPhase::NONE));
+ EXPECT_TRUE(
+ LogContainsEndEvent(entry_list, 9, NetLogEventType::SOCKET_ALIVE));
// Let the RST_STREAM write while |rst| is in-scope.
base::RunLoop().RunUntilIdle();
« no previous file with comments | « net/spdy/spdy_proxy_client_socket.cc ('k') | net/spdy/spdy_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698