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

Unified Diff: net/spdy/spdy_network_transaction_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_http_stream.cc ('k') | net/spdy/spdy_proxy_client_socket.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_network_transaction_unittest.cc
diff --git a/net/spdy/spdy_network_transaction_unittest.cc b/net/spdy/spdy_network_transaction_unittest.cc
index d6b2f2a76c32878b3fd60d4dc25cb889d97ba52a..647797dd61e1265ac0581c3000747c2aaac0f336 100644
--- a/net/spdy/spdy_network_transaction_unittest.cc
+++ b/net/spdy/spdy_network_transaction_unittest.cc
@@ -30,6 +30,7 @@
#include "net/http/http_network_transaction.h"
#include "net/http/http_server_properties.h"
#include "net/http/http_transaction_test_util.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"
@@ -3261,28 +3262,29 @@ TEST_F(SpdyNetworkTransactionTest, NetLog) {
EXPECT_LT(0u, entries.size());
int pos = 0;
- pos = ExpectLogContainsSomewhere(entries, 0,
- NetLog::TYPE_HTTP_TRANSACTION_SEND_REQUEST,
- NetLog::PHASE_BEGIN);
- pos = ExpectLogContainsSomewhere(entries, pos + 1,
- NetLog::TYPE_HTTP_TRANSACTION_SEND_REQUEST,
- NetLog::PHASE_END);
- pos = ExpectLogContainsSomewhere(entries, pos + 1,
- NetLog::TYPE_HTTP_TRANSACTION_READ_HEADERS,
- NetLog::PHASE_BEGIN);
- pos = ExpectLogContainsSomewhere(entries, pos + 1,
- NetLog::TYPE_HTTP_TRANSACTION_READ_HEADERS,
- NetLog::PHASE_END);
+ pos = ExpectLogContainsSomewhere(
+ entries, 0, NetLogEventType::HTTP_TRANSACTION_SEND_REQUEST,
+ NetLogEventPhase::BEGIN);
+ pos = ExpectLogContainsSomewhere(
+ entries, pos + 1, NetLogEventType::HTTP_TRANSACTION_SEND_REQUEST,
+ NetLogEventPhase::END);
+ pos = ExpectLogContainsSomewhere(
+ entries, pos + 1, NetLogEventType::HTTP_TRANSACTION_READ_HEADERS,
+ NetLogEventPhase::BEGIN);
+ pos = ExpectLogContainsSomewhere(
+ entries, pos + 1, NetLogEventType::HTTP_TRANSACTION_READ_HEADERS,
+ NetLogEventPhase::END);
pos = ExpectLogContainsSomewhere(entries, pos + 1,
- NetLog::TYPE_HTTP_TRANSACTION_READ_BODY,
- NetLog::PHASE_BEGIN);
+ NetLogEventType::HTTP_TRANSACTION_READ_BODY,
+ NetLogEventPhase::BEGIN);
pos = ExpectLogContainsSomewhere(entries, pos + 1,
- NetLog::TYPE_HTTP_TRANSACTION_READ_BODY,
- NetLog::PHASE_END);
+ NetLogEventType::HTTP_TRANSACTION_READ_BODY,
+ NetLogEventPhase::END);
// Check that we logged all the headers correctly
- pos = ExpectLogContainsSomewhere(
- entries, 0, NetLog::TYPE_HTTP2_SESSION_SEND_HEADERS, NetLog::PHASE_NONE);
+ pos = ExpectLogContainsSomewhere(entries, 0,
+ NetLogEventType::HTTP2_SESSION_SEND_HEADERS,
+ NetLogEventPhase::NONE);
base::ListValue* header_list;
ASSERT_TRUE(entries[pos].params.get());
« no previous file with comments | « net/spdy/spdy_http_stream.cc ('k') | net/spdy/spdy_proxy_client_socket.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698