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

net/log/test_net_log_util.h

Index: net/log/test_net_log_util.h
diff --git a/net/log/test_net_log_util.h b/net/log/test_net_log_util.h
index 8734cea953002fb98c218e3aa1df27035f155bf1..3426449883e77d3a4bd3c7871f7573974306a7ac 100644
--- a/net/log/test_net_log_util.h
+++ b/net/log/test_net_log_util.h
@@ -8,6 +8,7 @@
 #include <stddef.h>
 
 #include "net/log/net_log.h"
+#include "net/log/net_log_event_type.h"
 #include "net/log/test_net_log_entry.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -20,27 +21,27 @@ namespace net {
 ::testing::AssertionResult LogContainsEvent(
     const TestNetLogEntry::List& entries,
     int offset,
-    NetLog::EventType expected_event,
-    NetLog::EventPhase expected_phase);
+    NetLogEventType expected_event,
+    NetLogEventPhase expected_phase);
 
 // Just like LogContainsEvent, but always checks for an EventPhase of
 // PHASE_BEGIN.
 ::testing::AssertionResult LogContainsBeginEvent(
     const TestNetLogEntry::List& entries,
     int offset,
-    NetLog::EventType expected_event);
+    NetLogEventType expected_event);
 
 // Just like LogContainsEvent, but always checks for an EventPhase of PHASE_END.
 ::testing::AssertionResult LogContainsEndEvent(
     const TestNetLogEntry::List& entries,
     int offset,
-    NetLog::EventType expected_event);
+    NetLogEventType expected_event);
 
 // Just like LogContainsEvent, but does not check phase.
 ::testing::AssertionResult LogContainsEntryWithType(
     const TestNetLogEntry::List& entries,
     int offset,
-    NetLog::EventType type);
+    NetLogEventType type);
 
 // Check if the log contains an entry of the given type at |start_offset| or
 // after.  It is not a failure if there's an earlier matching entry.  Negative
@@ -48,23 +49,23 @@ namespace net {
 ::testing::AssertionResult LogContainsEntryWithTypeAfter(
     const TestNetLogEntry::List& entries,
     int start_offset,
-    NetLog::EventType type);
+    NetLogEventType type);
 
 // Check if the first entry with the specified values is at |start_offset| or
 // after. It is a failure if there's an earlier matching entry.  Negative
 // offsets are relative to the end of the array.
 size_t ExpectLogContainsSomewhere(const TestNetLogEntry::List& entries,
                                   size_t min_offset,
-                                  NetLog::EventType expected_event,
-                                  NetLog::EventPhase expected_phase);
+                                  NetLogEventType expected_event,
+                                  NetLogEventPhase expected_phase);
 
 // Check if the log contains an entry with  the given values at |start_offset|
 // or after.  It is not a failure if there's an earlier matching entry.
 // Negative offsets are relative to the end of the array.
 size_t ExpectLogContainsSomewhereAfter(const TestNetLogEntry::List& entries,
                                        size_t start_offset,
-                                       NetLog::EventType expected_event,
-                                       NetLog::EventPhase expected_phase);
+                                       NetLogEventType expected_event,
+                                       NetLogEventPhase expected_phase);
 
 }  // namespace net