| Index: cc/animation/transform_operations_unittest.cc
|
| diff --git a/cc/animation/transform_operations_unittest.cc b/cc/animation/transform_operations_unittest.cc
|
| index 906be862e51960bc63d011ad092383e3b8b26c2b..295df8017b9844b4483dae7f38d28d411b1d4376 100644
|
| --- a/cc/animation/transform_operations_unittest.cc
|
| +++ b/cc/animation/transform_operations_unittest.cc
|
| @@ -24,23 +24,23 @@ TEST(TransformOperationTest, TransformTypesAreUnique) {
|
| std::vector<std::unique_ptr<TransformOperations>> transforms;
|
|
|
| std::unique_ptr<TransformOperations> to_add(
|
| - base::WrapUnique(new TransformOperations()));
|
| + base::MakeUnique<TransformOperations>());
|
| to_add->AppendTranslate(1, 0, 0);
|
| transforms.push_back(std::move(to_add));
|
|
|
| - to_add = base::WrapUnique(new TransformOperations());
|
| + to_add = base::MakeUnique<TransformOperations>();
|
| to_add->AppendRotate(0, 0, 1, 2);
|
| transforms.push_back(std::move(to_add));
|
|
|
| - to_add = base::WrapUnique(new TransformOperations());
|
| + to_add = base::MakeUnique<TransformOperations>();
|
| to_add->AppendScale(2, 2, 2);
|
| transforms.push_back(std::move(to_add));
|
|
|
| - to_add = base::WrapUnique(new TransformOperations());
|
| + to_add = base::MakeUnique<TransformOperations>();
|
| to_add->AppendSkew(1, 0);
|
| transforms.push_back(std::move(to_add));
|
|
|
| - to_add = base::WrapUnique(new TransformOperations());
|
| + to_add = base::MakeUnique<TransformOperations>();
|
| to_add->AppendPerspective(800);
|
| transforms.push_back(std::move(to_add));
|
|
|
| @@ -96,50 +96,50 @@ TEST(TransformOperationTest, MatchTypesDifferentLength) {
|
| std::vector<std::unique_ptr<TransformOperations>> GetIdentityOperations() {
|
| std::vector<std::unique_ptr<TransformOperations>> operations;
|
| std::unique_ptr<TransformOperations> to_add(
|
| - base::WrapUnique(new TransformOperations()));
|
| + base::MakeUnique<TransformOperations>());
|
| operations.push_back(std::move(to_add));
|
|
|
| - to_add = base::WrapUnique(new TransformOperations());
|
| + to_add = base::MakeUnique<TransformOperations>();
|
| to_add->AppendTranslate(0, 0, 0);
|
| operations.push_back(std::move(to_add));
|
|
|
| - to_add = base::WrapUnique(new TransformOperations());
|
| + to_add = base::MakeUnique<TransformOperations>();
|
| to_add->AppendTranslate(0, 0, 0);
|
| to_add->AppendTranslate(0, 0, 0);
|
| operations.push_back(std::move(to_add));
|
|
|
| - to_add = base::WrapUnique(new TransformOperations());
|
| + to_add = base::MakeUnique<TransformOperations>();
|
| to_add->AppendScale(1, 1, 1);
|
| operations.push_back(std::move(to_add));
|
|
|
| - to_add = base::WrapUnique(new TransformOperations());
|
| + to_add = base::MakeUnique<TransformOperations>();
|
| to_add->AppendScale(1, 1, 1);
|
| to_add->AppendScale(1, 1, 1);
|
| operations.push_back(std::move(to_add));
|
|
|
| - to_add = base::WrapUnique(new TransformOperations());
|
| + to_add = base::MakeUnique<TransformOperations>();
|
| to_add->AppendSkew(0, 0);
|
| operations.push_back(std::move(to_add));
|
|
|
| - to_add = base::WrapUnique(new TransformOperations());
|
| + to_add = base::MakeUnique<TransformOperations>();
|
| to_add->AppendSkew(0, 0);
|
| to_add->AppendSkew(0, 0);
|
| operations.push_back(std::move(to_add));
|
|
|
| - to_add = base::WrapUnique(new TransformOperations());
|
| + to_add = base::MakeUnique<TransformOperations>();
|
| to_add->AppendRotate(0, 0, 1, 0);
|
| operations.push_back(std::move(to_add));
|
|
|
| - to_add = base::WrapUnique(new TransformOperations());
|
| + to_add = base::MakeUnique<TransformOperations>();
|
| to_add->AppendRotate(0, 0, 1, 0);
|
| to_add->AppendRotate(0, 0, 1, 0);
|
| operations.push_back(std::move(to_add));
|
|
|
| - to_add = base::WrapUnique(new TransformOperations());
|
| + to_add = base::MakeUnique<TransformOperations>();
|
| to_add->AppendMatrix(gfx::Transform());
|
| operations.push_back(std::move(to_add));
|
|
|
| - to_add = base::WrapUnique(new TransformOperations());
|
| + to_add = base::MakeUnique<TransformOperations>();
|
| to_add->AppendMatrix(gfx::Transform());
|
| to_add->AppendMatrix(gfx::Transform());
|
| operations.push_back(std::move(to_add));
|
|
|