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

net/log/write_to_file_net_log_observer_unittest.cc

 // Copyright 2013 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 "net/log/write_to_file_net_log_observer.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_file.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_reader.h"
 #include "base/values.h"
 #include "net/log/net_log.h"
+#include "net/log/net_log_event_type.h"
+#include "net/log/net_log_source_type.h"
 #include "net/log/net_log_util.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
 namespace {
 
@@ skipping 55 matching lines @@
 }
 
 TEST_F(WriteToFileNetLogObserverTest, GeneratesValidJSONWithOneEvent) {
   base::ScopedFILE file(base::OpenFile(log_path_, "w"));
   ASSERT_TRUE(file);
   std::unique_ptr<WriteToFileNetLogObserver> logger(
       new WriteToFileNetLogObserver());
   logger->StartObserving(&net_log_, std::move(file), nullptr, nullptr);
 
   const int kDummyId = 1;
-  NetLog::Source source(NetLog::SOURCE_HTTP2_SESSION, kDummyId);
-  NetLog::EntryData entry_data(NetLog::TYPE_PROXY_SERVICE, source,
-                               NetLog::PHASE_BEGIN, base::TimeTicks::Now(),
+  NetLog::Source source(NetLogSourceType::HTTP2_SESSION, kDummyId);
+  NetLog::EntryData entry_data(NetLogEventType::PROXY_SERVICE, source,
+                               NetLogEventPhase::BEGIN, base::TimeTicks::Now(),
                                NULL);
   NetLog::Entry entry(&entry_data, NetLogCaptureMode::IncludeSocketBytes());
   logger->OnAddEntry(entry);
   logger->StopObserving(nullptr);
   logger.reset();
 
   std::string input;
   ASSERT_TRUE(base::ReadFileToString(log_path_, &input));
 
   base::JSONReader reader;
   std::unique_ptr<base::Value> root(reader.ReadToValue(input));
   ASSERT_TRUE(root) << reader.GetErrorMessage();
 
   base::DictionaryValue* dict;
   ASSERT_TRUE(root->GetAsDictionary(&dict));
   base::ListValue* events;
   ASSERT_TRUE(dict->GetList("events", &events));
   ASSERT_EQ(1u, events->GetSize());
 }
 
 TEST_F(WriteToFileNetLogObserverTest, GeneratesValidJSONWithMultipleEvents) {
   base::ScopedFILE file(base::OpenFile(log_path_, "w"));
   ASSERT_TRUE(file);
   std::unique_ptr<WriteToFileNetLogObserver> logger(
       new WriteToFileNetLogObserver());
   logger->StartObserving(&net_log_, std::move(file), nullptr, nullptr);
 
   const int kDummyId = 1;
-  NetLog::Source source(NetLog::SOURCE_HTTP2_SESSION, kDummyId);
-  NetLog::EntryData entry_data(NetLog::TYPE_PROXY_SERVICE, source,
-                               NetLog::PHASE_BEGIN, base::TimeTicks::Now(),
+  NetLog::Source source(NetLogSourceType::HTTP2_SESSION, kDummyId);
+  NetLog::EntryData entry_data(NetLogEventType::PROXY_SERVICE, source,
+                               NetLogEventPhase::BEGIN, base::TimeTicks::Now(),
                                NULL);
   NetLog::Entry entry(&entry_data, NetLogCaptureMode::IncludeSocketBytes());
 
   // Add the entry multiple times.
   logger->OnAddEntry(entry);
   logger->OnAddEntry(entry);
   logger->StopObserving(nullptr);
   logger.reset();
 
   std::string input;
@@ skipping 105 matching lines @@
   ASSERT_EQ(1u, events->GetSize());
 
   // Make sure additional information is present, but don't validate it.
   base::DictionaryValue* tab_info;
   ASSERT_TRUE(dict->GetDictionary("tabInfo", &tab_info));
 }
 
 }  // namespace
 
 }  // namespace net