Index: cc/debug/micro_benchmark.h |
diff --git a/cc/debug/micro_benchmark.h b/cc/debug/micro_benchmark.h |
index c5bbd883164b6237efa80c05c308f58b5344f0e9..d224734645342f8c8a9ee63c5ada97229fae5fa9 100644 |
--- a/cc/debug/micro_benchmark.h |
+++ b/cc/debug/micro_benchmark.h |
@@ -5,8 +5,9 @@ |
#ifndef CC_DEBUG_MICRO_BENCHMARK_H_ |
#define CC_DEBUG_MICRO_BENCHMARK_H_ |
+#include <memory> |
+ |
#include "base/callback.h" |
-#include "base/memory/scoped_ptr.h" |
#include "cc/base/cc_export.h" |
namespace base { |
@@ -22,7 +23,7 @@ class PictureLayer; |
class MicroBenchmarkImpl; |
class CC_EXPORT MicroBenchmark { |
public: |
- typedef base::Callback<void(scoped_ptr<base::Value>)> DoneCallback; |
+ typedef base::Callback<void(std::unique_ptr<base::Value>)> DoneCallback; |
explicit MicroBenchmark(const DoneCallback& callback); |
virtual ~MicroBenchmark(); |
@@ -35,16 +36,16 @@ class CC_EXPORT MicroBenchmark { |
virtual void RunOnLayer(Layer* layer); |
virtual void RunOnLayer(PictureLayer* layer); |
- virtual bool ProcessMessage(scoped_ptr<base::Value> value); |
+ virtual bool ProcessMessage(std::unique_ptr<base::Value> value); |
bool ProcessedForBenchmarkImpl() const; |
- scoped_ptr<MicroBenchmarkImpl> GetBenchmarkImpl( |
+ std::unique_ptr<MicroBenchmarkImpl> GetBenchmarkImpl( |
scoped_refptr<base::SingleThreadTaskRunner> origin_task_runner); |
protected: |
- void NotifyDone(scoped_ptr<base::Value> result); |
+ void NotifyDone(std::unique_ptr<base::Value> result); |
- virtual scoped_ptr<MicroBenchmarkImpl> CreateBenchmarkImpl( |
+ virtual std::unique_ptr<MicroBenchmarkImpl> CreateBenchmarkImpl( |
scoped_refptr<base::SingleThreadTaskRunner> origin_task_runner); |
private: |