summaryrefslogtreecommitdiffstats
path: root/cc/debug/micro_benchmark_controller.cc
diff options
context:
space:
mode:
authordanakj <danakj@chromium.org>2014-09-26 19:39:25 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-27 02:39:41 +0000
commit7bb3dbede19d87f0338797756ffd738adc6bca08 (patch)
treeecd66a8fe850e5c57833a673fb39c41dbe27ffeb /cc/debug/micro_benchmark_controller.cc
parenta60566701028a7344d17826076780eeb84b63052 (diff)
downloadchromium_src-7bb3dbede19d87f0338797756ffd738adc6bca08.zip
chromium_src-7bb3dbede19d87f0338797756ffd738adc6bca08.tar.gz
chromium_src-7bb3dbede19d87f0338797756ffd738adc6bca08.tar.bz2
cc: Remove use of PassAs() and constructor-casting with scoped_ptr.
Say you have class A and subclass B. Previously it was required to PassAs() a scoped_ptr<B> into a scoped_ptr<A>. This is no longer needed, so just use Pass(). For newly created scoped_ptrs, you can just use make_scoped_ptr always now. And when you want to return or assign an empty scoped_ptr(), you can now use nullptr directly. Also adds PRESUBMIT checks for: - return scoped<T>(foo). This should be return make_scoped_ptr(foo). - bar = scoped<T>(foo). This should be return bar = make_scoped_ptr(foo). - return scoped<T>(). This should be return nullptr. - bar = scoped<T>(). This should be return bar = nullptr. This also replaces p.reset() with p = nullptr; But it does not add a PRESUBMIT check for that because there are things other than scoped_ptr with a reset() function. R=enne@chromium.org Review URL: https://codereview.chromium.org/609663003 Cr-Commit-Position: refs/heads/master@{#297096}
Diffstat (limited to 'cc/debug/micro_benchmark_controller.cc')
-rw-r--r--cc/debug/micro_benchmark_controller.cc13
1 files changed, 5 insertions, 8 deletions
diff --git a/cc/debug/micro_benchmark_controller.cc b/cc/debug/micro_benchmark_controller.cc
index 8b20bdf..bf98100 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 {