[Fuchsia] Switch from generated-ordinal back to ordinal.

Bindings generators now accept both the ordinal and generated-ordinal
values, so we can start sending ordinal to servers, to get automatically
moved to 64-bit when ordinal migrates.

Bug: 991300
Change-Id: I37b3ef48596fd9bd62344a8614bcdcac0b48bd6d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1834566
Auto-Submit: Wez <wez@chromium.org>
Commit-Queue: Kevin Marshall <kmarshall@chromium.org>
Reviewed-by: Kevin Marshall <kmarshall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#702536}

build/fuchsia/fidlgen_js/fidl.py

@@ -293,7 +293,7 @@ class InterfaceMethodParameter:
 
 
 class InterfaceMethod:
-    def __init__(self, has_request, has_response, maybe_attributes, maybe_request, maybe_request_alignment, maybe_request_size, maybe_response, maybe_response_alignment, maybe_response_size, name, ordinal, generated_ordinal):
+    def __init__(self, has_request, has_response, maybe_attributes, maybe_request, maybe_request_alignment, maybe_request_size, maybe_response, maybe_response_alignment, maybe_response_size, name, ordinal):
         self.has_request = has_request
         self.has_response = has_response
         self.maybe_attributes = maybe_attributes
@@ -305,8 +305,6 @@ class InterfaceMethod:
         self.maybe_response_size = maybe_response_size
         self.name = name
         self.ordinal = ordinal
-        # TODO(https://crbug.com/991300): Remove once |ordinal| is 64-bit.
-        self.generated_ordinal = generated_ordinal
 
     @staticmethod
     def from_dict(obj):
@@ -322,9 +320,7 @@ class InterfaceMethod:
         maybe_response_size = from_union([from_int, from_none], obj.get(u"maybe_response_size"))
         name = from_str(obj.get(u"name"))
         ordinal = from_int(obj.get(u"ordinal"))
-        # TODO(https://crbug.com/991300): Remove once |ordinal| is 64-bit.
-        generated_ordinal = from_int(obj.get(u"generated_ordinal"))
-        return InterfaceMethod(has_request, has_response, maybe_attributes, maybe_request, maybe_request_alignment, maybe_request_size, maybe_response, maybe_response_alignment, maybe_response_size, name, ordinal, generated_ordinal)
+        return InterfaceMethod(has_request, has_response, maybe_attributes, maybe_request, maybe_request_alignment, maybe_request_size, maybe_response, maybe_response_alignment, maybe_response_size, name, ordinal)
 
     def to_dict(self):
         result = {}
@@ -339,8 +335,6 @@ class InterfaceMethod:
         result[u"maybe_response_size"] = from_union([from_int, from_none], self.maybe_response_size)
         result[u"name"] = from_str(self.name)
         result[u"ordinal"] = from_int(self.ordinal)
-        # TODO(https://crbug.com/991300): Remove once |ordinal| is 64-bit.
-        result[u"generated_ordinal"] = from_int(self.generated_ordinal)
         return result
 
 

build/fuchsia/fidlgen_js/gen.py

@@ -525,8 +525,7 @@ function %(name)s() {}
           'const _k%(name)s_%(method_name)s_Ordinal = %(ordinal)sn;\n' % {
               'name': name,
               'method_name': method_name,
-              # TODO(https://crbug.com/991300): Use |ordinal| once it is 64-bit.
-              'ordinal': method.generated_ordinal
+              'ordinal': method.ordinal
           })
 
     self.f.write('\n')