| Index: cc/debug/micro_benchmark_controller.cc
|
| diff --git a/cc/debug/micro_benchmark_controller.cc b/cc/debug/micro_benchmark_controller.cc
|
| index 8b20bdf197f7ddfc9e157329bab5ec5cae178915..bf98100541921966b6b236ad869c7a169ecc1253 100644
|
| --- a/cc/debug/micro_benchmark_controller.cc
|
| +++ b/cc/debug/micro_benchmark_controller.cc
|
| @@ -28,19 +28,16 @@ scoped_ptr<MicroBenchmark> CreateBenchmark(
|
| scoped_ptr<base::Value> value,
|
| const MicroBenchmark::DoneCallback& callback) {
|
| if (name == "invalidation_benchmark") {
|
| - return scoped_ptr<MicroBenchmark>(
|
| - new InvalidationBenchmark(value.Pass(), callback));
|
| + return make_scoped_ptr(new InvalidationBenchmark(value.Pass(), callback));
|
| } else if (name == "picture_record_benchmark") {
|
| - return scoped_ptr<MicroBenchmark>(
|
| - new PictureRecordBenchmark(value.Pass(), callback));
|
| + return make_scoped_ptr(new PictureRecordBenchmark(value.Pass(), callback));
|
| } else if (name == "rasterize_and_record_benchmark") {
|
| - return scoped_ptr<MicroBenchmark>(
|
| + return make_scoped_ptr(
|
| new RasterizeAndRecordBenchmark(value.Pass(), callback));
|
| } else if (name == "unittest_only_benchmark") {
|
| - return scoped_ptr<MicroBenchmark>(
|
| - new UnittestOnlyBenchmark(value.Pass(), callback));
|
| + return make_scoped_ptr(new UnittestOnlyBenchmark(value.Pass(), callback));
|
| }
|
| - return scoped_ptr<MicroBenchmark>();
|
| + return nullptr;
|
| }
|
|
|
| class IsDonePredicate {
|
|
|