diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-07-14 17:41:05 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-08-04 12:37:36 +0000 |
| commit | 399c965b6064c440ddcf4015f5f8e9d131c7a0a6 (patch) | |
| tree | 6b06b60ff365abef0e13b3503d593a0df48d20e8 /chromium/net/base/backoff_entry_serializer.h | |
| parent | 7366110654eec46f21b6824f302356426f48cd74 (diff) | |
| download | qtwebengine-chromium-399c965b6064c440ddcf4015f5f8e9d131c7a0a6.tar.gz | |
BASELINE: Update Chromium to 52.0.2743.76 and Ninja to 1.7.1
Change-Id: I382f51b959689505a60f8b707255ecb344f7d8b4
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/net/base/backoff_entry_serializer.h')
| -rw-r--r-- | chromium/net/base/backoff_entry_serializer.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/chromium/net/base/backoff_entry_serializer.h b/chromium/net/base/backoff_entry_serializer.h index 837265727fb..1ecaf015d70 100644 --- a/chromium/net/base/backoff_entry_serializer.h +++ b/chromium/net/base/backoff_entry_serializer.h @@ -5,8 +5,9 @@ #ifndef NET_BASE_BACKOFF_ENTRY_SERIALIZER_H_ #define NET_BASE_BACKOFF_ENTRY_SERIALIZER_H_ +#include <memory> + #include "base/macros.h" -#include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "net/base/backoff_entry.h" #include "net/base/net_export.h" @@ -30,8 +31,9 @@ class NET_EXPORT BackoffEntrySerializer { // be converted to an absolute timestamp, thus the time will continue counting // down even whilst the device is powered off, and will be partially // vulnerable to changes in the system clock time. - static scoped_ptr<base::Value> SerializeToValue(const BackoffEntry& entry, - base::Time time_now); + static std::unique_ptr<base::Value> SerializeToValue( + const BackoffEntry& entry, + base::Time time_now); // Deserializes a ListValue back to a BackoffEntry. |policy| MUST be the same // Policy as the serialized entry had. |clock| may be NULL. Both |policy| and @@ -40,7 +42,7 @@ class NET_EXPORT BackoffEntrySerializer { // simulate time changes. The absolute timestamp that was serialized will be // converted back to TimeTicks as best as possible. Returns NULL if // deserialization was unsuccessful. - static scoped_ptr<BackoffEntry> DeserializeFromValue( + static std::unique_ptr<BackoffEntry> DeserializeFromValue( const base::Value& serialized, const BackoffEntry::Policy* policy, base::TickClock* clock, |