summaryrefslogtreecommitdiffstats
path: root/cc/test/layer_test_common.h
diff options
context:
space:
mode:
Diffstat (limited to 'cc/test/layer_test_common.h')
-rw-r--r--cc/test/layer_test_common.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/cc/test/layer_test_common.h b/cc/test/layer_test_common.h
index e322632..85f2f8a 100644
--- a/cc/test/layer_test_common.h
+++ b/cc/test/layer_test_common.h
@@ -57,7 +57,7 @@ class LayerTestCommon {
scoped_ptr<T> layer =
T::Create(host_->host_impl()->active_tree(), layer_impl_id_++);
T* ptr = layer.get();
- root_layer_impl_->AddChild(layer.Pass());
+ root_layer_impl_->AddChild(std::move(layer));
return ptr;
}
@@ -66,7 +66,7 @@ class LayerTestCommon {
scoped_ptr<T> layer =
T::Create(host_->host_impl()->active_tree(), layer_impl_id_++);
T* ptr = layer.get();
- parent->AddChild(layer.Pass());
+ parent->AddChild(std::move(layer));
return ptr;
}
@@ -75,7 +75,7 @@ class LayerTestCommon {
scoped_ptr<T> layer =
T::Create(host_->host_impl()->active_tree(), layer_impl_id_++, a);
T* ptr = layer.get();
- root_layer_impl_->AddChild(layer.Pass());
+ root_layer_impl_->AddChild(std::move(layer));
return ptr;
}
@@ -84,7 +84,7 @@ class LayerTestCommon {
scoped_ptr<T> layer =
T::Create(host_->host_impl()->active_tree(), layer_impl_id_++, a, b);
T* ptr = layer.get();
- root_layer_impl_->AddChild(layer.Pass());
+ root_layer_impl_->AddChild(std::move(layer));
return ptr;
}
@@ -93,7 +93,7 @@ class LayerTestCommon {
scoped_ptr<T> layer = T::Create(host_->host_impl()->active_tree(),
layer_impl_id_++, a, b, c, d);
T* ptr = layer.get();
- root_layer_impl_->AddChild(layer.Pass());
+ root_layer_impl_->AddChild(std::move(layer));
return ptr;
}
@@ -111,7 +111,7 @@ class LayerTestCommon {
scoped_ptr<T> layer = T::Create(host_->host_impl()->active_tree(),
layer_impl_id_++, a, b, c, d, e);
T* ptr = layer.get();
- root_layer_impl_->AddChild(layer.Pass());
+ root_layer_impl_->AddChild(std::move(layer));
return ptr;
}