Revert "Generate some of the C++ bindings for mojom tagged unions."

mojo/public/tools/bindings/generators/mojom_cpp_generator.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Generates C++ source files from a mojom.Module."""
 
 import mojom.generate.generator as generator
 import mojom.generate.module as mojom
 import mojom.generate.pack as pack
 from mojom.generate.template_expander import UseJinja
@@ skipping 265 matching lines @@
 
 def ShouldInlineStruct(struct):
   # TODO(darin): Base this on the size of the wrapper class.
   if len(struct.fields) > 4:
     return False
   for field in struct.fields:
     if mojom.IsMoveOnlyKind(field.kind):
       return False
   return True
 
-def ShouldInlineUnion(union):
-  return not all(not mojom.IsMoveOnlyKind(field.kind) for field in union.fields)
-
 def GetArrayValidateParams(kind):
   if (not mojom.IsArrayKind(kind) and not mojom.IsMapKind(kind) and
       not mojom.IsStringKind(kind)):
     return "mojo::internal::NoValidateParams"
 
   if mojom.IsStringKind(kind):
     expected_num_elements = 0
     element_is_nullable = False
     element_validate_params = "mojo::internal::NoValidateParams"
   elif mojom.IsMapKind(kind):
@@ skipping 31 matching lines @@
     "cpp_type": GetCppType,
     "cpp_wrapper_type": GetCppWrapperType,
     "default_value": DefaultValue,
     "expression_to_text": ExpressionToText,
     "get_array_validate_params": GetArrayValidateParams,
     "get_map_validate_params": GetMapValidateParams,
     "get_name_for_kind": GetNameForKind,
     "get_pad": pack.GetPad,
     "has_callbacks": mojom.HasCallbacks,
     "should_inline": ShouldInlineStruct,
-    "should_inline_union": ShouldInlineUnion,
     "is_array_kind": mojom.IsArrayKind,
     "is_cloneable_kind": mojom.IsCloneableKind,
     "is_enum_kind": mojom.IsEnumKind,
     "is_move_only_kind": mojom.IsMoveOnlyKind,
     "is_any_handle_kind": mojom.IsAnyHandleKind,
     "is_interface_kind": mojom.IsInterfaceKind,
     "is_interface_request_kind": mojom.IsInterfaceRequestKind,
     "is_map_kind": mojom.IsMapKind,
     "is_nullable_kind": mojom.IsNullableKind,
     "is_object_kind": mojom.IsObjectKind,
     "is_string_kind": mojom.IsStringKind,
     "is_struct_kind": mojom.IsStructKind,
     "is_struct_with_handles": IsStructWithHandles,
-    "is_union_kind": mojom.IsUnionKind,
     "struct_size": lambda ps: ps.GetTotalSize() + _HEADER_SIZE,
     "struct_from_method": generator.GetStructFromMethod,
     "response_struct_from_method": generator.GetResponseStructFromMethod,
     "stylize_method": generator.StudlyCapsToCamel,
     "to_all_caps": generator.CamelCaseToAllCaps,
-    "under_to_camel": generator.UnderToCamel,
   }
 
   def GetJinjaExports(self):
     return {
       "module": self.module,
       "namespace": self.module.namespace,
       "namespaces_as_array": NamespaceToArray(self.module.namespace),
       "imports": self.module.imports,
       "kinds": self.module.kinds,
       "enums": self.module.enums,
       "structs": self.GetStructs(),
-      "unions": self.module.unions,
       "interfaces": self.module.interfaces,
     }
 
   @UseJinja("cpp_templates/module.h.tmpl", filters=cpp_filters)
   def GenerateModuleHeader(self):
     return self.GetJinjaExports()
 
   @UseJinja("cpp_templates/module-internal.h.tmpl", filters=cpp_filters)
   def GenerateModuleInternalHeader(self):
     return self.GetJinjaExports()
 
   @UseJinja("cpp_templates/module.cc.tmpl", filters=cpp_filters)
   def GenerateModuleSource(self):
     return self.GetJinjaExports()
 
   def GenerateFiles(self, args):
     self.Write(self.GenerateModuleHeader(),
         self.MatchMojomFilePath("%s.h" % self.module.name))
     self.Write(self.GenerateModuleInternalHeader(),
         self.MatchMojomFilePath("%s-internal.h" % self.module.name))
     self.Write(self.GenerateModuleSource(),
         self.MatchMojomFilePath("%s.cc" % self.module.name))