Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / cc / debug / micro_benchmark_controller.cc

diff --git a/src/cc/debug/micro_benchmark_controller.cc b/src/cc/debug/micro_benchmark_controller.cc
index 8b20bdf..bf98100 100644 (file)
--- a/src/cc/debug/micro_benchmark_controller.cc
+++ b/src/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 {