Index: base/threading/sequenced_worker_pool.cc |
diff --git a/base/threading/sequenced_worker_pool.cc b/base/threading/sequenced_worker_pool.cc |
index 086f54ba805e1c11fb519d441730ae34822d8acc..24a07511a9847a4faba4dc855470cbda3fbb347b 100644 |
--- a/base/threading/sequenced_worker_pool.cc |
+++ b/base/threading/sequenced_worker_pool.cc |
@@ -8,6 +8,7 @@ |
#include <list> |
#include <map> |
+#include <memory> |
#include <set> |
#include <utility> |
#include <vector> |
@@ -19,7 +20,7 @@ |
#include "base/lazy_instance.h" |
#include "base/logging.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
+#include "base/memory/ptr_util.h" |
#include "base/stl_util.h" |
#include "base/strings/stringprintf.h" |
#include "base/synchronization/condition_variable.h" |
@@ -445,7 +446,7 @@ class SequencedWorkerPool::Inner { |
// Owning pointers to all threads we've created so far, indexed by |
// ID. Since we lazily create threads, this may be less than |
// max_threads_ and will be initially empty. |
- using ThreadMap = std::map<PlatformThreadId, scoped_ptr<Worker>>; |
+ using ThreadMap = std::map<PlatformThreadId, std::unique_ptr<Worker>>; |
ThreadMap threads_; |
// Set to true when we're in the process of creating another thread. |
@@ -786,7 +787,7 @@ void SequencedWorkerPool::Inner::ThreadLoop(Worker* this_worker) { |
DCHECK(thread_being_created_); |
thread_being_created_ = false; |
auto result = threads_.insert( |
- std::make_pair(this_worker->tid(), make_scoped_ptr(this_worker))); |
+ std::make_pair(this_worker->tid(), WrapUnique(this_worker))); |
DCHECK(result.second); |
while (true) { |