Extracted NetLog class's inner enum types into their own enum classes and

net/spdy/spdy_network_transaction_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <cmath>
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 12 matching lines @@
 #include "net/base/proxy_delegate.h"
 #include "net/base/request_priority.h"
 #include "net/base/test_proxy_delegate.h"
 #include "net/base/upload_bytes_element_reader.h"
 #include "net/base/upload_file_element_reader.h"
 #include "net/http/http_auth_scheme.h"
 #include "net/http/http_network_session_peer.h"
 #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"
 #include "net/proxy/proxy_server.h"
 #include "net/socket/client_socket_pool_base.h"
 #include "net/socket/next_proto.h"
 #include "net/spdy/buffered_spdy_framer.h"
 #include "net/spdy/spdy_http_stream.h"
 #include "net/spdy/spdy_http_utils.h"
 #include "net/spdy/spdy_session.h"
@@ skipping 3211 matching lines @@
 
   // Check that the NetLog was filled reasonably.
   // This test is intentionally non-specific about the exact ordering of the
   // log; instead we just check to make sure that certain events exist, and that
   // they are in the right order.
   TestNetLogEntry::List entries;
   log.GetEntries(&entries);
 
   EXPECT_LT(0u, entries.size());
   int pos = 0;
-  pos = ExpectLogContainsSomewhere(entries, 0,
-                                   NetLog::TYPE_HTTP_TRANSACTION_SEND_REQUEST,
-                                   NetLog::PHASE_BEGIN);
+  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_SEND_REQUEST,
-                                   NetLog::PHASE_END);
+                                   NetLogEventType::HTTP_TRANSACTION_READ_BODY,
+                                   NetLogEventPhase::BEGIN);
   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, pos + 1,
-                                   NetLog::TYPE_HTTP_TRANSACTION_READ_BODY,
-                                   NetLog::PHASE_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());
   ASSERT_TRUE(entries[pos].params->GetList("headers", &header_list));
 
   std::vector<std::string> expected;
   expected.push_back(std::string(spdy_util_.GetHostKey()) +
                      ": www.example.org");
   expected.push_back(std::string(spdy_util_.GetPathKey()) + ": /");
   expected.push_back(std::string(spdy_util_.GetSchemeKey()) + ": " +
@@ skipping 2930 matching lines @@
 TEST_F(SpdyNetworkTransactionTLSUsageCheckTest, TLSCipherSuiteSucky) {
   std::unique_ptr<SSLSocketDataProvider> ssl_provider(
       new SSLSocketDataProvider(ASYNC, OK));
   // Set to TLS_RSA_WITH_NULL_MD5
   SSLConnectionStatusSetCipherSuite(0x1, &ssl_provider->connection_status);
 
   RunTLSUsageCheckTest(std::move(ssl_provider));
 }
 
 }  // namespace net