Index: media/base/bind_to_current_loop.h |
diff --git a/media/base/bind_to_current_loop.h b/media/base/bind_to_current_loop.h |
index 8c14e9e88cd40ad8cec0098f71f2cb53a58b56c2..1398412aa592f2a0eda9679f8e4b42e32cd7ee64 100644 |
--- a/media/base/bind_to_current_loop.h |
+++ b/media/base/bind_to_current_loop.h |
@@ -5,9 +5,10 @@ |
#ifndef MEDIA_BASE_BIND_TO_CURRENT_LOOP_H_ |
#define MEDIA_BASE_BIND_TO_CURRENT_LOOP_H_ |
+#include <memory> |
+ |
#include "base/bind.h" |
#include "base/location.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/memory/scoped_vector.h" |
#include "base/single_thread_task_runner.h" |
#include "base/thread_task_runner_handle.h" |
@@ -34,8 +35,10 @@ template <typename T> |
T& TrampolineForward(T& t) { return t; } |
template <typename T, typename R> |
-base::internal::PassedWrapper<scoped_ptr<T, R> > TrampolineForward( |
- scoped_ptr<T, R>& p) { return base::Passed(&p); } |
+base::internal::PassedWrapper<std::unique_ptr<T, R>> TrampolineForward( |
+ std::unique_ptr<T, R>& p) { |
+ return base::Passed(&p); |
+} |
template <typename T> |
base::internal::PassedWrapper<ScopedVector<T> > TrampolineForward( |