| Index: cc/debug/rasterize_and_record_benchmark.h
|
| diff --git a/cc/debug/rasterize_and_record_benchmark.h b/cc/debug/rasterize_and_record_benchmark.h
|
| index a049d38afd83a0060f96c5da02a57b1316466958..f68b566aa793bdfd74ae8fe9625eb5b7e4a66b40 100644
|
| --- a/cc/debug/rasterize_and_record_benchmark.h
|
| +++ b/cc/debug/rasterize_and_record_benchmark.h
|
| @@ -29,7 +29,7 @@ class Layer;
|
| class RasterizeAndRecordBenchmark : public MicroBenchmark {
|
| public:
|
| explicit RasterizeAndRecordBenchmark(
|
| - scoped_ptr<base::Value> value,
|
| + std::unique_ptr<base::Value> value,
|
| const MicroBenchmark::DoneCallback& callback);
|
| ~RasterizeAndRecordBenchmark() override;
|
|
|
| @@ -37,11 +37,11 @@ class RasterizeAndRecordBenchmark : public MicroBenchmark {
|
| void DidUpdateLayers(LayerTreeHost* host) override;
|
| void RunOnLayer(PictureLayer* layer) override;
|
|
|
| - scoped_ptr<MicroBenchmarkImpl> CreateBenchmarkImpl(
|
| + std::unique_ptr<MicroBenchmarkImpl> CreateBenchmarkImpl(
|
| scoped_refptr<base::SingleThreadTaskRunner> origin_task_runner) override;
|
|
|
| private:
|
| - void RecordRasterResults(scoped_ptr<base::Value> results);
|
| + void RecordRasterResults(std::unique_ptr<base::Value> results);
|
|
|
| struct RecordResults {
|
| RecordResults();
|
| @@ -54,8 +54,8 @@ class RasterizeAndRecordBenchmark : public MicroBenchmark {
|
|
|
| RecordResults record_results_;
|
| int record_repeat_count_;
|
| - scoped_ptr<base::Value> settings_;
|
| - scoped_ptr<base::DictionaryValue> results_;
|
| + std::unique_ptr<base::Value> settings_;
|
| + std::unique_ptr<base::DictionaryValue> results_;
|
|
|
| // The following is used in DCHECKs.
|
| bool main_thread_benchmark_done_;
|
|
|