1 files changed, 16 insertions, 13 deletions
diff --git a/chromium/net/disk_cache/net_log_parameters.h b/chromium/net/disk_cache/net_log_parameters.h
index 2bbed1232d5..86c5c3cc5b1 100644
--- a/chromium/net/disk_cache/net_log_parameters.h
+++ b/chromium/net/disk_cache/net_log_parameters.h
@@ -9,9 +9,13 @@
 
 #include <string>
 
-#include "net/log/net_log.h"
+#include "net/log/net_log_parameters_callback.h"
 
-// This file contains a set of functions to create NetLog::ParametersCallbacks
+namespace net {
+struct NetLogSource;
+}
+
+// This file contains a set of functions to create NetLogParametersCallbacks
 // shared by EntryImpls and MemEntryImpls.
 namespace disk_cache {
 
@@ -21,41 +25,40 @@ class Entry;
 // Entry.  Contains the Entry's key and whether it was created or opened.
 // |entry| can't be NULL, must support GetKey(), and must outlive the returned
 // callback.
-net::NetLog::ParametersCallback CreateNetLogEntryCreationCallback(
+net::NetLogParametersCallback CreateNetLogEntryCreationCallback(
     const Entry* entry,
     bool created);
 
 // Creates a NetLog callback that returns parameters for start of a non-sparse
 // read or write of an Entry.  For reads, |truncate| must be false.
-net::NetLog::ParametersCallback CreateNetLogReadWriteDataCallback(
-    int index,
-    int offset,
-    int buf_len,
-    bool truncate);
+net::NetLogParametersCallback CreateNetLogReadWriteDataCallback(int index,
+                                                                int offset,
+                                                                int buf_len,
+                                                                bool truncate);
 
 // Creates a NetLog callback that returns parameters for when a non-sparse
 // read or write completes.  For reads, |truncate| must be false.
 // |bytes_copied| is either the number of bytes copied or a network error
 // code.  |bytes_copied| must not be ERR_IO_PENDING, as it's not a valid
 // result for an operation.
-net::NetLog::ParametersCallback CreateNetLogReadWriteCompleteCallback(
+net::NetLogParametersCallback CreateNetLogReadWriteCompleteCallback(
     int bytes_copied);
 
 // Creates a NetLog callback that returns parameters for when a sparse
 // operation is started.
-net::NetLog::ParametersCallback CreateNetLogSparseOperationCallback(
+net::NetLogParametersCallback CreateNetLogSparseOperationCallback(
     int64_t offset,
     int buf_len);
 
 // Creates a NetLog callback that returns parameters for when a read or write
 // for a sparse entry's child is started.
-net::NetLog::ParametersCallback CreateNetLogSparseReadWriteCallback(
-    const net::NetLog::Source& source,
+net::NetLogParametersCallback CreateNetLogSparseReadWriteCallback(
+    const net::NetLogSource& source,
     int child_len);
 
 // Creates a NetLog callback that returns parameters for when a call to
 // GetAvailableRange returns.
-net::NetLog::ParametersCallback CreateNetLogGetAvailableRangeResultCallback(
+net::NetLogParametersCallback CreateNetLogGetAvailableRangeResultCallback(
     int64_t start,
     int result);