| 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 418e68194b6fa5ef72317a4ec57cdd38884ba6bf..a24b83f3c82bf8e2083cf2a40be1fc203d659d54 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"
|
| @@ -3262,27 +3263,28 @@ 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);
|
| + NetLogEventType::HTTP_TRANSACTION_SEND_REQUEST,
|
| + NetLogEventPhase::BEGIN);
|
| pos = ExpectLogContainsSomewhere(entries, pos + 1,
|
| - NetLog::TYPE_HTTP_TRANSACTION_SEND_REQUEST,
|
| - NetLog::PHASE_END);
|
| + NetLogEventType::HTTP_TRANSACTION_SEND_REQUEST,
|
| + NetLogEventPhase::END);
|
| pos = ExpectLogContainsSomewhere(entries, pos + 1,
|
| - NetLog::TYPE_HTTP_TRANSACTION_READ_HEADERS,
|
| - NetLog::PHASE_BEGIN);
|
| + NetLogEventType::HTTP_TRANSACTION_READ_HEADERS,
|
| + NetLogEventPhase::BEGIN);
|
| pos = ExpectLogContainsSomewhere(entries, pos + 1,
|
| - NetLog::TYPE_HTTP_TRANSACTION_READ_HEADERS,
|
| - NetLog::PHASE_END);
|
| + 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);
|
| + entries, 0, NetLogEventType::HTTP2_SESSION_SEND_HEADERS,
|
| + NetLogEventPhase::NONE);
|
|
|
| base::ListValue* header_list;
|
| ASSERT_TRUE(entries[pos].params.get());
|
|
|