Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(96)

Unified Diff: sync/internal_api/public/attachments/task_queue.h

Issue 1866243002: Convert //sync from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: sync/internal_api/public/attachments/task_queue.h
diff --git a/sync/internal_api/public/attachments/task_queue.h b/sync/internal_api/public/attachments/task_queue.h
index 9d430b821fde8a203de4aac4d8db2f013b4e0ab2..439a179ba3644e8b70315252c9fa6e51f42f6795 100644
--- a/sync/internal_api/public/attachments/task_queue.h
+++ b/sync/internal_api/public/attachments/task_queue.h
@@ -8,13 +8,13 @@
#include <stddef.h>
#include <deque>
+#include <memory>
#include <set>
#include <utility>
#include "base/bind.h"
#include "base/callback.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/threading/non_thread_safe.h"
@@ -135,7 +135,7 @@ class TaskQueue : base::NonThreadSafe {
// Use |timer| for scheduled events.
//
// Used in tests. See also MockTimer.
- void SetTimerForTest(scoped_ptr<base::Timer> timer);
+ void SetTimerForTest(std::unique_ptr<base::Timer> timer);
private:
void FinishTask(const T& task);
@@ -146,14 +146,14 @@ class TaskQueue : base::NonThreadSafe {
const HandleTaskCallback process_callback_;
net::BackoffEntry::Policy backoff_policy_;
- scoped_ptr<net::BackoffEntry> backoff_entry_;
+ std::unique_ptr<net::BackoffEntry> backoff_entry_;
// The number of tasks currently being handled.
int num_in_progress_;
std::deque<T> queue_;
// The set of tasks in queue_ or currently being handled.
std::set<T> tasks_;
base::Closure dispatch_closure_;
- scoped_ptr<base::Timer> backoff_timer_;
+ std::unique_ptr<base::Timer> backoff_timer_;
base::TimeDelta delay_;
// Must be last data member.
@@ -234,7 +234,7 @@ void TaskQueue<T>::ResetBackoff() {
}
template <typename T>
-void TaskQueue<T>::SetTimerForTest(scoped_ptr<base::Timer> timer) {
+void TaskQueue<T>::SetTimerForTest(std::unique_ptr<base::Timer> timer) {
DCHECK(CalledOnValidThread());
DCHECK(timer.get());
backoff_timer_ = std::move(timer);

Powered by Google App Engine
This is Rietveld 408576698