Index: ppapi/shared_impl/tracked_callback.h |
diff --git a/ppapi/shared_impl/tracked_callback.h b/ppapi/shared_impl/tracked_callback.h |
index b80e680aeddc138489eaef8b109cf101fe5fd8e3..89690c38c04b679d6e663f89bb8bc34f5faf4ae5 100644 |
--- a/ppapi/shared_impl/tracked_callback.h |
+++ b/ppapi/shared_impl/tracked_callback.h |
@@ -8,12 +8,12 @@ |
#include <stdint.h> |
#include <map> |
+#include <memory> |
#include <set> |
#include "base/callback.h" |
#include "base/macros.h" |
#include "base/memory/ref_counted.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/synchronization/condition_variable.h" |
#include "base/synchronization/lock.h" |
#include "ppapi/c/pp_completion_callback.h" |
@@ -192,7 +192,7 @@ class PPAPI_SHARED_EXPORT TrackedCallback |
// Used for pausing/waking the blocked thread if this is a blocking completion |
// callback. Note that in-process, there is no lock, blocking callbacks are |
// not allowed, and therefore this pointer will be NULL. |
- scoped_ptr<base::ConditionVariable> operation_completed_condvar_; |
+ std::unique_ptr<base::ConditionVariable> operation_completed_condvar_; |
DISALLOW_IMPLICIT_CONSTRUCTORS(TrackedCallback); |
}; |