Index: remoting/host/backoff_timer.h |
diff --git a/remoting/host/backoff_timer.h b/remoting/host/backoff_timer.h |
index a75a8d30bdf38616be69099bda8df1208f8a4705..5f4ab36e039bf5836e64b11c6b822d288cf124ab 100644 |
--- a/remoting/host/backoff_timer.h |
+++ b/remoting/host/backoff_timer.h |
@@ -5,9 +5,10 @@ |
#ifndef REMOTING_HOST_BACKOFF_TIMER_H_ |
#define REMOTING_HOST_BACKOFF_TIMER_H_ |
+#include <memory> |
+ |
#include "base/callback.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/timer/timer.h" |
#include "net/base/backoff_entry.h" |
@@ -33,17 +34,17 @@ class BackoffTimer { |
// Returns true if the user task may be invoked in the future. |
bool IsRunning() const { return !!backoff_entry_; } |
- void SetTimerForTest(scoped_ptr<base::Timer> timer); |
+ void SetTimerForTest(std::unique_ptr<base::Timer> timer); |
private: |
void StartTimer(); |
void OnTimerFired(); |
- scoped_ptr<base::Timer> timer_; |
+ std::unique_ptr<base::Timer> timer_; |
base::Closure user_task_; |
tracked_objects::Location posted_from_; |
net::BackoffEntry::Policy backoff_policy_ = {}; |
- scoped_ptr<net::BackoffEntry> backoff_entry_; |
+ std::unique_ptr<net::BackoffEntry> backoff_entry_; |
DISALLOW_COPY_AND_ASSIGN(BackoffTimer); |
}; |