Revert "Update mojo sdk to rev 1dc8a9a5db73d3718d99917fadf31f5fb2ebad4f"

third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_dart_generator.py

Index: third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_dart_generator.py
diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_dart_generator.py b/third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_dart_generator.py
index 11e300cfadf99734e698ab6fe4e19eb2c3937a36..20040100b38ae896591fed551743b78016515fe3 100644
--- a/third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_dart_generator.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_dart_generator.py
@@ -149,7 +149,7 @@ def DartDefaultValue(field):
 def DartDeclType(kind):
   if kind in mojom.PRIMITIVES:
     return _kind_to_dart_decl_type[kind]
-  if mojom.IsStructKind(kind) or mojom.IsUnionKind(kind):
+  if mojom.IsStructKind(kind):
     return GetDartType(kind)
   if mojom.IsArrayKind(kind):
     array_type = DartDeclType(kind.kind)
@@ -191,7 +191,7 @@ def ConstantStyle(name):
 
 def GetNameForElement(element):
   if (mojom.IsEnumKind(element) or mojom.IsInterfaceKind(element) or
-      mojom.IsStructKind(element) or mojom.IsUnionKind(element)):
+      mojom.IsStructKind(element)):
     return UpperCamelCase(element.name)
   if mojom.IsInterfaceRequestKind(element):
     return GetNameForElement(element.kind)
@@ -291,8 +291,6 @@ def EncodeMethod(kind, variable, offset, bit):
   def _EncodeMethodName(kind):
     if mojom.IsStructKind(kind):
       return 'encodeStruct'
-    if mojom.IsUnionKind(kind):
-      return 'encodeUnion'
     if mojom.IsArrayKind(kind):
       return _EncodeMethodName(kind.kind) + 'Array'
     if mojom.IsEnumKind(kind):
@@ -377,7 +375,6 @@ class Generator(generator.Generator):
     'is_nullable_kind': mojom.IsNullableKind,
     'is_pointer_array_kind': IsPointerArrayKind,
     'is_struct_kind': mojom.IsStructKind,
-    'is_union_kind': mojom.IsUnionKind,
     'dart_true_false': GetDartTrueFalse,
     'dart_type': DartDeclType,
     'name': GetNameForElement,
@@ -401,13 +398,10 @@ class Generator(generator.Generator):
   def GenerateLibModule(self, args):
     return self.GetParameters(args)
 
-
   def GenerateFiles(self, args):
     elements = self.module.namespace.split('.')
     elements.append("%s.dart" % self.module.name)
-    path = os.path.join("dart-pkg", "mojom/lib", *elements)
-    self.Write(self.GenerateLibModule(args), path)
-    path = os.path.join("dart-gen", "mojom/lib", *elements)
+    path = os.path.join("dart-gen", "mojom", *elements)
     self.Write(self.GenerateLibModule(args), path)
     link = self.MatchMojomFilePath("%s.dart" % self.module.name)
     if os.path.exists(os.path.join(self.output_dir, link)):