Refactor NetLog::LogLevel --> NetLogCaptureMode.

net/log/net_log_util.cc

 // Copyright 2014 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/net_log_util.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 111 matching lines @@
   if (request1->creation_time() > request2->creation_time())
     return false;
   // If requests were created at the same time, sort by ID.  Mostly matters for
   // testing purposes.
   return request1->identifier() < request2->identifier();
 }
 
 // Returns a Value representing the state of a pre-existing URLRequest when
 // net-internals was opened.
 base::Value* GetRequestStateAsValue(const net::URLRequest* request,
-                                    net::NetLog::LogLevel log_level) {
+                                    net::NetLogCaptureMode capture_mode) {
   return request->GetStateAsValue();
 }
 
 }  // namespace
 
 scoped_ptr<base::DictionaryValue> GetNetConstants() {
   scoped_ptr<base::DictionaryValue> constants_dict(new base::DictionaryValue());
 
   // Version of the file format.
   constants_dict->SetInteger("logFormatVersion", kLogFormatVersion);
@@ skipping 104 matching lines @@
     dict->SetInteger("PHASE_BEGIN", net::NetLog::PHASE_BEGIN);
     dict->SetInteger("PHASE_END", net::NetLog::PHASE_END);
     dict->SetInteger("PHASE_NONE", net::NetLog::PHASE_NONE);
 
     constants_dict->Set("logEventPhase", dict);
   }
 
   // Information about the relationship between source type enums and
   // their symbolic names.
   constants_dict->Set("logSourceType", net::NetLog::GetSourceTypesAsValue());
 

[mmenke, 2015/04/17 15:16:06]

Removing the block breaks loading newer logs with older versions of Chrome. 
Maybe keep an empty dictionary for a quarter or two?  (And should verify that we
can load logs across versions)

[eroman, 2015/04/17 19:20:50]

Oh right, good point! Done

-  // Information about the relationship between LogLevel enums and their
-  // symbolic names.
-  {
-    base::DictionaryValue* dict = new base::DictionaryValue();
-
-    dict->SetInteger("LOG_ALL", net::NetLog::LOG_ALL);
-    dict->SetInteger("LOG_ALL_BUT_BYTES", net::NetLog::LOG_ALL_BUT_BYTES);
-    dict->SetInteger("LOG_STRIP_PRIVATE_DATA",
-                     net::NetLog::LOG_STRIP_PRIVATE_DATA);
-
-    constants_dict->Set("logLevelType", dict);
-  }
-
   // Information about the relationship between address family enums and
   // their symbolic names.
   {
     base::DictionaryValue* dict = new base::DictionaryValue();
 
     dict->SetInteger("ADDRESS_FAMILY_UNSPECIFIED",
                      net::ADDRESS_FAMILY_UNSPECIFIED);
     dict->SetInteger("ADDRESS_FAMILY_IPV4", net::ADDRESS_FAMILY_IPV4);
     dict->SetInteger("ADDRESS_FAMILY_IPV6", net::ADDRESS_FAMILY_IPV6);
 
@@ skipping 250 matching lines @@
 
   // Create fake events.
   ScopedVector<NetLog::Entry> entries;
   for (const auto& request : requests) {
     net::NetLog::ParametersCallback callback =
         base::Bind(&GetRequestStateAsValue, base::Unretained(request));
 
     net::NetLog::EntryData entry_data(
         net::NetLog::TYPE_REQUEST_ALIVE, request->net_log().source(),
         net::NetLog::PHASE_BEGIN, request->creation_time(), &callback);
-    NetLog::Entry entry(&entry_data, request->net_log().GetLogLevel());
+    NetLog::Entry entry(&entry_data, request->net_log().GetCaptureMode());
     observer->OnAddEntry(entry);
   }
 }
 
 }  // namespace net