Convert //cc from scoped_ptr to std::unique_ptr.

cc/layers/layer_iterator_unittest.cc

Index: cc/layers/layer_iterator_unittest.cc
diff --git a/cc/layers/layer_iterator_unittest.cc b/cc/layers/layer_iterator_unittest.cc
index 158dd93520052e6d03e74b2185eff58dce7c2b3b..4667877f885347376c22a1ecda6a2591d8972a49 100644
--- a/cc/layers/layer_iterator_unittest.cc
+++ b/cc/layers/layer_iterator_unittest.cc
@@ -6,6 +6,7 @@
 
 #include <vector>
 
+#include "base/memory/ptr_util.h"
 #include "cc/layers/layer.h"
 #include "cc/test/fake_layer_tree_host.h"
 #include "cc/test/test_task_graph_runner.h"
@@ -24,8 +25,8 @@ namespace {
 
 class TestLayerImpl : public LayerImpl {
  public:
-  static scoped_ptr<TestLayerImpl> Create(LayerTreeImpl* tree, int id) {
-    return make_scoped_ptr(new TestLayerImpl(tree, id));
+  static std::unique_ptr<TestLayerImpl> Create(LayerTreeImpl* tree, int id) {
+    return base::WrapUnique(new TestLayerImpl(tree, id));
   }
   ~TestLayerImpl() override {}
 
@@ -98,7 +99,7 @@ class LayerIteratorTest : public testing::Test {
                    &task_graph_runner_),
         id_(1) {}
 
-  scoped_ptr<TestLayerImpl> CreateLayer() {
+  std::unique_ptr<TestLayerImpl> CreateLayer() {
     return TestLayerImpl::Create(host_impl_.active_tree(), id_++);
   }
 
@@ -118,11 +119,11 @@ TEST_F(LayerIteratorTest, EmptyTree) {
 }
 
 TEST_F(LayerIteratorTest, SimpleTree) {
-  scoped_ptr<TestLayerImpl> root_layer = CreateLayer();
-  scoped_ptr<TestLayerImpl> first = CreateLayer();
-  scoped_ptr<TestLayerImpl> second = CreateLayer();
-  scoped_ptr<TestLayerImpl> third = CreateLayer();
-  scoped_ptr<TestLayerImpl> fourth = CreateLayer();
+  std::unique_ptr<TestLayerImpl> root_layer = CreateLayer();
+  std::unique_ptr<TestLayerImpl> first = CreateLayer();
+  std::unique_ptr<TestLayerImpl> second = CreateLayer();
+  std::unique_ptr<TestLayerImpl> third = CreateLayer();
+  std::unique_ptr<TestLayerImpl> fourth = CreateLayer();
 
   TestLayerImpl* root_ptr = root_layer.get();
   TestLayerImpl* first_ptr = first.get();
@@ -153,15 +154,15 @@ TEST_F(LayerIteratorTest, SimpleTree) {
 }
 
 TEST_F(LayerIteratorTest, ComplexTree) {
-  scoped_ptr<TestLayerImpl> root_layer = CreateLayer();
-  scoped_ptr<TestLayerImpl> root1 = CreateLayer();
-  scoped_ptr<TestLayerImpl> root2 = CreateLayer();
-  scoped_ptr<TestLayerImpl> root3 = CreateLayer();
-  scoped_ptr<TestLayerImpl> root21 = CreateLayer();
-  scoped_ptr<TestLayerImpl> root22 = CreateLayer();
-  scoped_ptr<TestLayerImpl> root23 = CreateLayer();
-  scoped_ptr<TestLayerImpl> root221 = CreateLayer();
-  scoped_ptr<TestLayerImpl> root231 = CreateLayer();
+  std::unique_ptr<TestLayerImpl> root_layer = CreateLayer();
+  std::unique_ptr<TestLayerImpl> root1 = CreateLayer();
+  std::unique_ptr<TestLayerImpl> root2 = CreateLayer();
+  std::unique_ptr<TestLayerImpl> root3 = CreateLayer();
+  std::unique_ptr<TestLayerImpl> root21 = CreateLayer();
+  std::unique_ptr<TestLayerImpl> root22 = CreateLayer();
+  std::unique_ptr<TestLayerImpl> root23 = CreateLayer();
+  std::unique_ptr<TestLayerImpl> root221 = CreateLayer();
+  std::unique_ptr<TestLayerImpl> root231 = CreateLayer();
 
   TestLayerImpl* root_ptr = root_layer.get();
   TestLayerImpl* root1_ptr = root1.get();
@@ -204,15 +205,15 @@ TEST_F(LayerIteratorTest, ComplexTree) {
 }
 
 TEST_F(LayerIteratorTest, ComplexTreeMultiSurface) {
-  scoped_ptr<TestLayerImpl> root_layer = CreateLayer();
-  scoped_ptr<TestLayerImpl> root1 = CreateLayer();
-  scoped_ptr<TestLayerImpl> root2 = CreateLayer();
-  scoped_ptr<TestLayerImpl> root3 = CreateLayer();
-  scoped_ptr<TestLayerImpl> root21 = CreateLayer();
-  scoped_ptr<TestLayerImpl> root22 = CreateLayer();
-  scoped_ptr<TestLayerImpl> root23 = CreateLayer();
-  scoped_ptr<TestLayerImpl> root221 = CreateLayer();
-  scoped_ptr<TestLayerImpl> root231 = CreateLayer();
+  std::unique_ptr<TestLayerImpl> root_layer = CreateLayer();
+  std::unique_ptr<TestLayerImpl> root1 = CreateLayer();
+  std::unique_ptr<TestLayerImpl> root2 = CreateLayer();
+  std::unique_ptr<TestLayerImpl> root3 = CreateLayer();
+  std::unique_ptr<TestLayerImpl> root21 = CreateLayer();
+  std::unique_ptr<TestLayerImpl> root22 = CreateLayer();
+  std::unique_ptr<TestLayerImpl> root23 = CreateLayer();
+  std::unique_ptr<TestLayerImpl> root221 = CreateLayer();
+  std::unique_ptr<TestLayerImpl> root231 = CreateLayer();
 
   TestLayerImpl* root_ptr = root_layer.get();
   TestLayerImpl* root1_ptr = root1.get();