Chromium Code Reviews| Index: net/log/net_log_util.cc |
| diff --git a/net/log/net_log_util.cc b/net/log/net_log_util.cc |
| index 17d97c2fca30bbe201bff39a3677182cc6e57271..218dc67a7eadd94e5787895257a00d66aa24ac67 100644 |
| --- a/net/log/net_log_util.cc |
| +++ b/net/log/net_log_util.cc |
| @@ -129,7 +129,7 @@ bool RequestCreatedBefore(const net::URLRequest* request1, |
| // 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(); |
| } |
| @@ -255,19 +255,6 @@ scoped_ptr<base::DictionaryValue> GetNetConstants() { |
| // 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
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. |
| { |
| @@ -538,7 +525,7 @@ NET_EXPORT void CreateNetLogEntriesForActiveObjects( |
| 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); |
| } |
| } |