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

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

Issue 2603893002: Remove mojo::Map. (Closed)
Patch Set: Created 4 years 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/union_unittest.cc
diff --git a/mojo/public/cpp/bindings/tests/union_unittest.cc b/mojo/public/cpp/bindings/tests/union_unittest.cc
index 29197beda2bc0bd81f623aa260caf5ad538893f3..1baccaed2ef41cc04723bc52ccd9819e5d6a432f 100644
--- a/mojo/public/cpp/bindings/tests/union_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/union_unittest.cc
@@ -693,9 +693,9 @@ TEST(UnionTest, PodUnionInMap) {
TEST(UnionTest, PodUnionInMapSerialization) {
using MojomType = MapDataView<StringDataView, PodUnionDataView>;
- Map<String, PodUnionPtr> map;
- map.insert("one", PodUnion::New());
- map.insert("two", PodUnion::New());
+ std::unordered_map<std::string, PodUnionPtr> map;
+ map.insert(std::make_pair("one", PodUnion::New()));
+ map.insert(std::make_pair("two", PodUnion::New()));
map["one"]->set_f_int8(8);
map["two"]->set_f_int16(16);
@@ -713,7 +713,7 @@ TEST(UnionTest, PodUnionInMapSerialization) {
mojo::internal::Serialize<MojomType>(map, &buf, &data, &validate_params,
&context);
- Map<String, PodUnionPtr> map2;
+ std::unordered_map<std::string, PodUnionPtr> map2;
mojo::internal::Deserialize<MojomType>(data, &map2, &context);
EXPECT_EQ(8, map2["one"]->get_f_int8());
@@ -723,9 +723,9 @@ TEST(UnionTest, PodUnionInMapSerialization) {
TEST(UnionTest, PodUnionInMapSerializationWithNull) {
using MojomType = MapDataView<StringDataView, PodUnionDataView>;
- Map<String, PodUnionPtr> map;
- map.insert("one", PodUnion::New());
- map.insert("two", nullptr);
+ std::unordered_map<std::string, PodUnionPtr> map;
+ map.insert(std::make_pair("one", PodUnion::New()));
+ map.insert(std::make_pair("two", nullptr));
map["one"]->set_f_int8(8);
@@ -741,7 +741,7 @@ TEST(UnionTest, PodUnionInMapSerializationWithNull) {
mojo::internal::Serialize<MojomType>(map, &buf, &data, &validate_params,
&context);
- Map<String, PodUnionPtr> map2;
+ std::unordered_map<std::string, PodUnionPtr> map2;
mojo::internal::Deserialize<MojomType>(data, &map2, &context);
EXPECT_EQ(8, map2["one"]->get_f_int8());

Powered by Google App Engine
This is Rietveld 408576698