Index: base/synchronization/condition_variable_unittest.cc |
diff --git a/base/synchronization/condition_variable_unittest.cc b/base/synchronization/condition_variable_unittest.cc |
index 4503922ecec54688868d9e6dcf62e96aa88ac376..d60b2b8af58aa55c48886933c7682fb452d9f963 100644 |
--- a/base/synchronization/condition_variable_unittest.cc |
+++ b/base/synchronization/condition_variable_unittest.cc |
@@ -4,16 +4,18 @@ |
// Multi-threaded tests of ConditionVariable class. |
+#include "base/synchronization/condition_variable.h" |
+ |
#include <time.h> |
+ |
#include <algorithm> |
+#include <memory> |
#include <vector> |
#include "base/bind.h" |
#include "base/location.h" |
#include "base/logging.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/single_thread_task_runner.h" |
-#include "base/synchronization/condition_variable.h" |
#include "base/synchronization/lock.h" |
#include "base/synchronization/spin_wait.h" |
#include "base/threading/platform_thread.h" |
@@ -133,7 +135,7 @@ class WorkQueue : public PlatformThread::Delegate { |
const int thread_count_; |
int waiting_thread_count_; |
- scoped_ptr<PlatformThreadHandle[]> thread_handles_; |
+ std::unique_ptr<PlatformThreadHandle[]> thread_handles_; |
std::vector<int> assignment_history_; // Number of assignment per worker. |
std::vector<int> completion_history_; // Number of completions per worker. |
int thread_started_counter_; // Used to issue unique id to workers. |