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

mojo/public/tools/bindings/pylib/mojom/generate/data.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.
 
 # TODO(vtl): "data" is a pretty vague name. Rename it?
 
 import copy
 
 import module as mojom
 
@@ skipping 366 matching lines @@
   module.imports = map(
       lambda import_data: ImportFromData(module, import_data),
       data['imports'])
 
   # First pass collects kinds.
   module.enums = map(
       lambda enum: EnumFromData(module, enum, None), data['enums'])
   module.structs = map(
       lambda struct: StructFromData(module, struct), data['structs'])
   module.unions = map(
-      lambda union: UnionFromData(module, union), data.get('unions', []))
+      lambda union: UnionFromData(module, struct), data.get('unions', []))
   module.interfaces = map(
       lambda interface: InterfaceFromData(module, interface),
       data['interfaces'])
   module.constants = map(
       lambda constant: ConstantFromData(module, constant, None),
       data['constants'])
 
   # Second pass expands fields and methods. This allows fields and parameters
   # to refer to kinds defined anywhere in the mojom.
   for struct in module.structs:
@@ skipping 13 matching lines @@
 
 def OrderedModuleFromData(data):
   module = ModuleFromData(data)
   for interface in module.interfaces:
     next_ordinal = 0
     for method in interface.methods:
       if method.ordinal is None:
         method.ordinal = next_ordinal
       next_ordinal = method.ordinal + 1
   return module