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

cc/debug/micro_benchmark_controller_unittest.cc

Index: cc/debug/micro_benchmark_controller_unittest.cc
diff --git a/cc/debug/micro_benchmark_controller_unittest.cc b/cc/debug/micro_benchmark_controller_unittest.cc
index 1f2bfd8258ce376a32bd86b8103d082de19321b0..50021daf6ed70b740a5f8a5c5d13fae3de42e410 100644
--- a/cc/debug/micro_benchmark_controller_unittest.cc
+++ b/cc/debug/micro_benchmark_controller_unittest.cc
@@ -33,9 +33,9 @@
   }
 
   virtual void TearDown() OVERRIDE {
-    layer_tree_host_impl_ = nullptr;
-    layer_tree_host_ = nullptr;
-    impl_proxy_ = nullptr;
+    layer_tree_host_impl_.reset();
+    layer_tree_host_.reset();
+    impl_proxy_.reset();
   }
 
   FakeLayerTreeHostClient layer_tree_host_client_;
@@ -126,7 +126,7 @@
   // Schedule a main thread benchmark.
   int id = layer_tree_host_->ScheduleMicroBenchmark(
       "unittest_only_benchmark",
-      settings.Pass(),
+      settings.PassAs<base::Value>(),
       base::Bind(&IncrementCallCount, base::Unretained(&run_count)));
   EXPECT_GT(id, 0);
 
@@ -147,8 +147,8 @@
   // Send valid message to invalid benchmark (id = 0)
   scoped_ptr<base::DictionaryValue> message(new base::DictionaryValue);
   message->SetBoolean("can_handle", true);
-  bool message_handled =
-      layer_tree_host_->SendMessageToMicroBenchmark(0, message.Pass());
+  bool message_handled = layer_tree_host_->SendMessageToMicroBenchmark(
+      0, message.PassAs<base::Value>());
   EXPECT_FALSE(message_handled);
 
   // Schedule a benchmark
@@ -160,17 +160,17 @@
   EXPECT_GT(id, 0);
 
   // Send valid message to valid benchmark
-  message = make_scoped_ptr(new base::DictionaryValue);
+  message = scoped_ptr<base::DictionaryValue>(new base::DictionaryValue);
   message->SetBoolean("can_handle", true);
-  message_handled =
-      layer_tree_host_->SendMessageToMicroBenchmark(id, message.Pass());
+  message_handled = layer_tree_host_->SendMessageToMicroBenchmark(
+      id, message.PassAs<base::Value>());
   EXPECT_TRUE(message_handled);
 
   // Send invalid message to valid benchmark
-  message = make_scoped_ptr(new base::DictionaryValue);
+  message = scoped_ptr<base::DictionaryValue>(new base::DictionaryValue);
   message->SetBoolean("can_handle", false);
-  message_handled =
-      layer_tree_host_->SendMessageToMicroBenchmark(id, message.Pass());
+  message_handled = layer_tree_host_->SendMessageToMicroBenchmark(
+      id, message.PassAs<base::Value>());
   EXPECT_FALSE(message_handled);
 }