Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(291)

Unified Diff: mojo/public/cpp/bindings/tests/wtf_types_unittest.cc

Issue 2112093002: Mojo C++ bindings: Merge EncodePointers/DecodePointers into Serialize/Deserialize, respectively. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@61_array_fix
Patch Set: . Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: mojo/public/cpp/bindings/tests/wtf_types_unittest.cc
diff --git a/mojo/public/cpp/bindings/tests/wtf_types_unittest.cc b/mojo/public/cpp/bindings/tests/wtf_types_unittest.cc
index a6a88684345d29f26709d2e521eb61a6c862a67d..4ebf1583121c9ad3b9d0f9c751ec1f1c3ec68d0d 100644
--- a/mojo/public/cpp/bindings/tests/wtf_types_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/wtf_types_unittest.cc
@@ -110,7 +110,7 @@ TEST_F(WTFTypesTest, Serialization_WTFArrayToWTFArray) {
cloned_strs, &context);
mojo::internal::FixedBufferForTesting buf(size);
- mojo::internal::Array_Data<mojo::internal::String_Data*>* data;
+ typename mojo::internal::MojomTypeTraits<Array<mojo::String>>::Data* data;
mojo::internal::ContainerValidateParams validate_params(
0, true, new mojo::internal::ContainerValidateParams(0, false, nullptr));
mojo::internal::Serialize<Array<mojo::String>>(cloned_strs, &buf, &data,
@@ -131,7 +131,7 @@ TEST_F(WTFTypesTest, Serialization_WTFVectorToWTFVector) {
cloned_strs, &context);
mojo::internal::FixedBufferForTesting buf(size);
- mojo::internal::Array_Data<mojo::internal::String_Data*>* data;
+ typename mojo::internal::MojomTypeTraits<Array<mojo::String>>::Data* data;
mojo::internal::ContainerValidateParams validate_params(
0, true, new mojo::internal::ContainerValidateParams(0, false, nullptr));
mojo::internal::Serialize<Array<mojo::String>>(cloned_strs, &buf, &data,
@@ -151,7 +151,7 @@ TEST_F(WTFTypesTest, Serialization_WTFArrayToMojoArray) {
mojo::internal::PrepareToSerialize<Array<mojo::String>>(strs, &context);
mojo::internal::FixedBufferForTesting buf(size);
- mojo::internal::Array_Data<mojo::internal::String_Data*>* data;
+ typename mojo::internal::MojomTypeTraits<Array<mojo::String>>::Data* data;
mojo::internal::ContainerValidateParams validate_params(
0, true, new mojo::internal::ContainerValidateParams(0, false, nullptr));
mojo::internal::Serialize<Array<mojo::String>>(strs, &buf, &data,

Powered by Google App Engine
This is Rietveld 408576698