| Index: mojo/public/cpp/bindings/tests/type_conversion_unittest.cc
|
| diff --git a/mojo/public/cpp/bindings/tests/type_conversion_unittest.cc b/mojo/public/cpp/bindings/tests/type_conversion_unittest.cc
|
| index c4632a7d04e79eff988fd13489d93cb5675a2f68..53abdff9554d4d9d68c47f97375d0e9dd3a63bf0 100644
|
| --- a/mojo/public/cpp/bindings/tests/type_conversion_unittest.cc
|
| +++ b/mojo/public/cpp/bindings/tests/type_conversion_unittest.cc
|
| @@ -23,8 +23,8 @@ struct RedmondNamedRegion {
|
| std::vector<RedmondRect> rects;
|
| };
|
|
|
| -bool AreEqualRectArrays(const Array<test::RectPtr>& rects1,
|
| - const Array<test::RectPtr>& rects2) {
|
| +bool AreEqualRectArrays(const std::vector<test::RectPtr>& rects1,
|
| + const std::vector<test::RectPtr>& rects2) {
|
| if (rects1.size() != rects2.size())
|
| return false;
|
|
|
| @@ -70,7 +70,7 @@ struct TypeConverter<test::NamedRegionPtr, RedmondNamedRegion> {
|
| static test::NamedRegionPtr Convert(const RedmondNamedRegion& input) {
|
| test::NamedRegionPtr region(test::NamedRegion::New());
|
| region->name.emplace(input.name);
|
| - region->rects = Array<test::RectPtr>::From(input.rects).PassStorage();
|
| + region->rects = ConvertTo<std::vector<test::RectPtr>>(input.rects);
|
| return region;
|
| }
|
| };
|
| @@ -114,9 +114,9 @@ TEST(TypeConversionTest, CustomTypeConverter) {
|
| }
|
|
|
| TEST(TypeConversionTest, CustomTypeConverter_Array_Null) {
|
| - Array<RectPtr> rects;
|
| + std::vector<RectPtr> rects;
|
|
|
| - std::vector<RedmondRect> redmond_rects = rects.To<std::vector<RedmondRect>>();
|
| + auto redmond_rects = ConvertTo<std::vector<RedmondRect>>(rects);
|
|
|
| EXPECT_TRUE(redmond_rects.empty());
|
| }
|
| @@ -124,7 +124,7 @@ TEST(TypeConversionTest, CustomTypeConverter_Array_Null) {
|
| TEST(TypeConversionTest, CustomTypeConverter_Array) {
|
| const RedmondRect kBase = {10, 20, 30, 40};
|
|
|
| - Array<RectPtr> rects(10);
|
| + std::vector<RectPtr> rects(10);
|
| for (size_t i = 0; i < rects.size(); ++i) {
|
| RedmondRect rr = kBase;
|
| rr.left += static_cast<int32_t>(i);
|
| @@ -132,9 +132,9 @@ TEST(TypeConversionTest, CustomTypeConverter_Array) {
|
| rects[i] = Rect::From(rr);
|
| }
|
|
|
| - std::vector<RedmondRect> redmond_rects = rects.To<std::vector<RedmondRect>>();
|
| + auto redmond_rects = ConvertTo<std::vector<RedmondRect>>(rects);
|
|
|
| - Array<RectPtr> rects2 = Array<RectPtr>::From(redmond_rects);
|
| + auto rects2 = ConvertTo<std::vector<RectPtr>>(redmond_rects);
|
| EXPECT_TRUE(AreEqualRectArrays(rects, rects2));
|
| }
|
|
|
|
|