Update mojo sdk to rev e7270700d671fa8e458b4d8c9e47f7bcfb65da0b

third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/wrapper_union_class_definition.tmpl

Index: third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/wrapper_union_class_definition.tmpl
diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/wrapper_union_class_definition.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/wrapper_union_class_definition.tmpl
index b5e9c23781a297302ea397d7266f6c441eec5015..4355f41cfd386dd08d5e3078ad7d5f41d53d409a 100644
--- a/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/wrapper_union_class_definition.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/wrapper_union_class_definition.tmpl
@@ -21,8 +21,10 @@
   switch (tag_) {
 {%    for field in union.fields %}
     case Tag::{{field.name|upper}}:
-{%    if field.kind|is_object_kind %}
+{%    if field.kind|is_string_kind %}
       rv->set_{{field.name}}(*(data_.{{field.name}}));
+{%    elif field.kind|is_object_kind %}
+      rv->set_{{field.name}}(data_.{{field.name}}->Clone());
 {%-   else %}
       rv->set_{{field.name}}(data_.{{field.name}});
 {%-   endif %}
@@ -57,7 +59,7 @@ bool {{union.name}}::is_{{field.name}}() const {
   return tag_ == Tag::{{field.name|upper}};
 }
 
-{{field.kind|cpp_result_type}} {{union.name}}::get_{{field.name}}() const {
+{{field.kind|cpp_union_getter_return_type}} {{union.name}}::get_{{field.name}}() const {
   MOJO_DCHECK(tag_ == Tag::{{field.name|upper}});
 {%    if field.kind|is_object_kind %}
   return *(data_.{{field.name}});
@@ -70,6 +72,8 @@ void {{union.name}}::set_{{field.name}}({{field.kind|cpp_const_wrapper_type}} {{
   SwitchActive(Tag::{{field.name|upper}});
 {%    if field.kind|is_string_kind %}
   *(data_.{{field.name}}) = {{field.name}};
+{%    elif field.kind|is_object_kind %}
+  *(data_.{{field.name}}) = {{field.name}}.Pass();
 {%-   else %}
   data_.{{field.name}} = {{field.name}};
 {%-   endif %}
@@ -89,8 +93,8 @@ void {{union.name}}::SetActive(Tag new_active) {
   switch (new_active) {
 {%  for field in union.fields %}
     case Tag::{{field.name|upper}}:
-{%    if field.kind|is_string_kind %}
-      data_.{{field.name}} = new String();
+{%    if field.kind|is_object_kind %}
+      data_.{{field.name}} = new {{field.kind|cpp_wrapper_type}}();
 {%-   endif %}
       break;
 {%- endfor %}
@@ -103,7 +107,7 @@ void {{union.name}}::DestroyActive() {
   switch (tag_) {
 {%  for field in union.fields %}
     case Tag::{{field.name|upper}}:
-{%    if field.kind|is_string_kind %}
+{%    if field.kind|is_object_kind %}
       delete data_.{{field.name}};
 {%-   endif %}
       break;