| Index: cc/debug/micro_benchmark_impl.h
|
| diff --git a/cc/debug/micro_benchmark_impl.h b/cc/debug/micro_benchmark_impl.h
|
| index ed968a39fbc5010d79a1be9b2ac2d49d07e016bf..457eb4dbf4de969d38765004b34a6f4dd7a5e058 100644
|
| --- a/cc/debug/micro_benchmark_impl.h
|
| +++ b/cc/debug/micro_benchmark_impl.h
|
| @@ -5,8 +5,9 @@
|
| #ifndef CC_DEBUG_MICRO_BENCHMARK_IMPL_H_
|
| #define CC_DEBUG_MICRO_BENCHMARK_IMPL_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/callback.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "cc/base/cc_export.h"
|
|
|
| namespace base {
|
| @@ -21,7 +22,7 @@ class LayerImpl;
|
| class PictureLayerImpl;
|
| class CC_EXPORT MicroBenchmarkImpl {
|
| public:
|
| - typedef base::Callback<void(scoped_ptr<base::Value>)> DoneCallback;
|
| + typedef base::Callback<void(std::unique_ptr<base::Value>)> DoneCallback;
|
|
|
| explicit MicroBenchmarkImpl(
|
| const DoneCallback& callback,
|
| @@ -35,7 +36,7 @@ class CC_EXPORT MicroBenchmarkImpl {
|
| virtual void RunOnLayer(PictureLayerImpl* layer);
|
|
|
| protected:
|
| - void NotifyDone(scoped_ptr<base::Value> result);
|
| + void NotifyDone(std::unique_ptr<base::Value> result);
|
|
|
| private:
|
| DoneCallback callback_;
|
|
|