| Index: net/disk_cache/net_log_parameters.cc
|
| diff --git a/net/disk_cache/net_log_parameters.cc b/net/disk_cache/net_log_parameters.cc
|
| index 74ac2a2feb1ac8b48bb910dd4a997ba114cc841c..5d7e50f55958646b9fbb4e450b2697dd3cdaa020 100644
|
| --- a/net/disk_cache/net_log_parameters.cc
|
| +++ b/net/disk_cache/net_log_parameters.cc
|
| @@ -13,21 +13,23 @@
|
|
|
| namespace {
|
|
|
| -Value* NetLogEntryCreationCallback(const disk_cache::Entry* entry,
|
| - bool created,
|
| - net::NetLog::LogLevel /* log_level */) {
|
| - DictionaryValue* dict = new DictionaryValue();
|
| +base::Value* NetLogEntryCreationCallback(
|
| + const disk_cache::Entry* entry,
|
| + bool created,
|
| + net::NetLog::LogLevel /* log_level */) {
|
| + base::DictionaryValue* dict = new base::DictionaryValue();
|
| dict->SetString("key", entry->GetKey());
|
| dict->SetBoolean("created", created);
|
| return dict;
|
| }
|
|
|
| -Value* NetLogReadWriteDataCallback(int index,
|
| - int offset,
|
| - int buf_len,
|
| - bool truncate,
|
| - net::NetLog::LogLevel /* log_level */) {
|
| - DictionaryValue* dict = new DictionaryValue();
|
| +base::Value* NetLogReadWriteDataCallback(
|
| + int index,
|
| + int offset,
|
| + int buf_len,
|
| + bool truncate,
|
| + net::NetLog::LogLevel /* log_level */) {
|
| + base::DictionaryValue* dict = new base::DictionaryValue();
|
| dict->SetInteger("index", index);
|
| dict->SetInteger("offset", offset);
|
| dict->SetInteger("buf_len", buf_len);
|
| @@ -36,10 +38,11 @@ Value* NetLogReadWriteDataCallback(int index,
|
| return dict;
|
| }
|
|
|
| -Value* NetLogReadWriteCompleteCallback(int bytes_copied,
|
| - net::NetLog::LogLevel /* log_level */) {
|
| +base::Value* NetLogReadWriteCompleteCallback(
|
| + int bytes_copied,
|
| + net::NetLog::LogLevel /* log_level */) {
|
| DCHECK_NE(bytes_copied, net::ERR_IO_PENDING);
|
| - DictionaryValue* dict = new DictionaryValue();
|
| + base::DictionaryValue* dict = new base::DictionaryValue();
|
| if (bytes_copied < 0) {
|
| dict->SetInteger("net_error", bytes_copied);
|
| } else {
|
| @@ -48,10 +51,11 @@ Value* NetLogReadWriteCompleteCallback(int bytes_copied,
|
| return dict;
|
| }
|
|
|
| -Value* NetLogSparseOperationCallback(int64 offset,
|
| - int buff_len,
|
| - net::NetLog::LogLevel /* log_level */) {
|
| - DictionaryValue* dict = new DictionaryValue();
|
| +base::Value* NetLogSparseOperationCallback(
|
| + int64 offset,
|
| + int buff_len,
|
| + net::NetLog::LogLevel /* log_level */) {
|
| + base::DictionaryValue* dict = new base::DictionaryValue();
|
| // Values can only be created with at most 32-bit integers. Using a string
|
| // instead circumvents that restriction.
|
| dict->SetString("offset", base::Int64ToString(offset));
|
| @@ -59,20 +63,21 @@ Value* NetLogSparseOperationCallback(int64 offset,
|
| return dict;
|
| }
|
|
|
| -Value* NetLogSparseReadWriteCallback(const net::NetLog::Source& source,
|
| - int child_len,
|
| - net::NetLog::LogLevel /* log_level */) {
|
| - DictionaryValue* dict = new DictionaryValue();
|
| +base::Value* NetLogSparseReadWriteCallback(
|
| + const net::NetLog::Source& source,
|
| + int child_len,
|
| + net::NetLog::LogLevel /* log_level */) {
|
| + base::DictionaryValue* dict = new base::DictionaryValue();
|
| source.AddToEventParameters(dict);
|
| dict->SetInteger("child_len", child_len);
|
| return dict;
|
| }
|
|
|
| -Value* NetLogGetAvailableRangeResultCallback(
|
| +base::Value* NetLogGetAvailableRangeResultCallback(
|
| int64 start,
|
| int result,
|
| net::NetLog::LogLevel /* log_level */) {
|
| - DictionaryValue* dict = new DictionaryValue();
|
| + base::DictionaryValue* dict = new base::DictionaryValue();
|
| if (result > 0) {
|
| dict->SetInteger("length", result);
|
| dict->SetString("start", base::Int64ToString(start));
|
|
|