Revert of cc: Remove use of PassAs() and constructor-casting with scoped_ptr.

cc/debug/micro_benchmark_controller.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/debug/micro_benchmark_controller.h"
 
 #include <limits>
 #include <string>
 
 #include "base/callback.h"
@@ skipping 10 matching lines @@
 
 int MicroBenchmarkController::next_id_ = 1;
 
 namespace {
 
 scoped_ptr<MicroBenchmark> CreateBenchmark(
     const std::string& name,
     scoped_ptr<base::Value> value,
     const MicroBenchmark::DoneCallback& callback) {
   if (name == "invalidation_benchmark") {
-    return make_scoped_ptr(new InvalidationBenchmark(value.Pass(), callback));
+    return scoped_ptr<MicroBenchmark>(
+        new InvalidationBenchmark(value.Pass(), callback));
   } else if (name == "picture_record_benchmark") {
-    return make_scoped_ptr(new PictureRecordBenchmark(value.Pass(), callback));
+    return scoped_ptr<MicroBenchmark>(
+        new PictureRecordBenchmark(value.Pass(), callback));
   } else if (name == "rasterize_and_record_benchmark") {
-    return make_scoped_ptr(
+    return scoped_ptr<MicroBenchmark>(
         new RasterizeAndRecordBenchmark(value.Pass(), callback));
   } else if (name == "unittest_only_benchmark") {
-    return make_scoped_ptr(new UnittestOnlyBenchmark(value.Pass(), callback));
+    return scoped_ptr<MicroBenchmark>(
+        new UnittestOnlyBenchmark(value.Pass(), callback));
   }
-  return nullptr;
+  return scoped_ptr<MicroBenchmark>();
 }
 
 class IsDonePredicate {
  public:
   typedef const MicroBenchmark* argument_type;
   typedef bool result_type;
 
   result_type operator()(argument_type benchmark) const {
     return benchmark->IsDone();
   }
@@ skipping 71 matching lines @@
   CleanUpFinishedBenchmarks();
 }
 
 void MicroBenchmarkController::CleanUpFinishedBenchmarks() {
   benchmarks_.erase(
       benchmarks_.partition(std::not1(IsDonePredicate())),
       benchmarks_.end());
 }
 
 }  // namespace cc