Index: net/log/net_log.h |
diff --git a/net/log/net_log.h b/net/log/net_log.h |
index 01b49b2a4ae50b141eb4ff29a3543c14a2433858..53de234e75ae06ccbe5ce59f573e8813adf125a2 100644 |
--- a/net/log/net_log.h |
+++ b/net/log/net_log.h |
@@ -7,19 +7,18 @@ |
#include <stdint.h> |
+#include <memory> |
#include <string> |
-#include "build/build_config.h" |
- |
#include "base/atomicops.h" |
#include "base/callback_forward.h" |
#include "base/compiler_specific.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/observer_list.h" |
#include "base/strings/string16.h" |
#include "base/synchronization/lock.h" |
#include "base/time/time.h" |
+#include "build/build_config.h" |
#include "net/base/net_export.h" |
#include "net/log/net_log_capture_mode.h" |
@@ -74,7 +73,7 @@ class NET_EXPORT NetLog { |
// associated with an event. If called, it will be called synchronously, |
// so it need not have owning references. May be called more than once, or |
// not at all. May return NULL. |
- typedef base::Callback<scoped_ptr<base::Value>(NetLogCaptureMode)> |
+ typedef base::Callback<std::unique_ptr<base::Value>(NetLogCaptureMode)> |
ParametersCallback; |
// Identifies the entity that generated this log. The |id| field should |
@@ -139,7 +138,7 @@ class NET_EXPORT NetLog { |
// Returns the parameters as a Value. Returns NULL if there are no |
// parameters. Caller takes ownership of returned Value. |
- scoped_ptr<base::Value> ParametersToValue() const; |
+ std::unique_ptr<base::Value> ParametersToValue() const; |
private: |
const EntryData* const data_; |