[Fuchsia] Remove ordinals from FIDL files.

Ordinals have been deprecated. This also fixes some minor indentation
issues in FIDL files.

Change-Id: I687b2d35e11b56401771ce9aeea8465735d7ffb9
Reviewed-on: https://chromium-review.googlesource.com/c/1372659
Commit-Queue: Fabrice de Gans-Riberi <fdegans@chromium.org>
Reviewed-by: Wez <wez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#615733}

base/fuchsia/test.fidl

@@ -6,5 +6,5 @@ library base.fuchsia.testfidl;
 
 [Discoverable]
 interface TestInterface {
-    1: Add(int32 a, int32 b) -> (int32 sum);
+  Add(int32 a, int32 b) -> (int32 sum);
 };

build/fuchsia/fidlgen_js/test/simple.fidl

@@ -101,42 +101,42 @@ struct AfterPreviousReference {
 };
 
 interface AnotherInterface {
-  1: TimesTwo(int32 a) -> (int32 b);
+  TimesTwo(int32 a) -> (int32 b);
 };
 
 interface Testola {
-  1: DoSomething();
+  DoSomething();
 
-  2: PrintInt(int32 num);
+  PrintInt(int32 num);
 
-  3: PrintMsg(string msg);
+  PrintMsg(string msg);
 
-  4: VariousArgs(Blorp blorp, string:32 msg, vector<uint32> stuff);
+  VariousArgs(Blorp blorp, string:32 msg, vector<uint32> stuff);
 
-  5: WithResponse(int32 a, int32 b) -> (int32 sum);
+  WithResponse(int32 a, int32 b) -> (int32 sum);
 
-  6: SendAStruct(BasicStruct basic);
+  SendAStruct(BasicStruct basic);
 
-  7: NestedStructsWithResponse(BasicStruct basic) -> (StuffAndThings resp);
+  NestedStructsWithResponse(BasicStruct basic) -> (StuffAndThings resp);
 
-  8: PassHandles(handle<job> job) -> (handle<debuglog> debuglog);
+  PassHandles(handle<job> job) -> (handle<debuglog> debuglog);
 
-  9: ReceiveUnions(StructOfMultipleUnions somu);
+  ReceiveUnions(StructOfMultipleUnions somu);
 
-  10: SendUnions() -> (StructOfMultipleUnions somu);
+  SendUnions() -> (StructOfMultipleUnions somu);
 
-  11: SendVectorsOfString(vector<string> unsized,
-                          vector<string?> nullable,
-                          vector<string:10> max_strlen);
+  SendVectorsOfString(vector<string> unsized,
+                      vector<string?> nullable,
+                      vector<string:10> max_strlen);
 
-  12: VectorOfStruct(vector<StructWithUint> stuff)
-        -> (vector<StructWithUint> result);
+  VectorOfStruct(vector<StructWithUint> stuff)
+    -> (vector<StructWithUint> result);
 
-  13: PassVectorOfPrimitives(VectorsOfPrimitives input)
-        -> (VectorsOfPrimitives output);
+  PassVectorOfPrimitives(VectorsOfPrimitives input)
+    -> (VectorsOfPrimitives output);
 
-  14: PassVectorOfVMO(VectorOfHandleToVMO input)
-        -> (VectorOfHandleToVMO output);
+  PassVectorOfVMO(VectorOfHandleToVMO input)
+    -> (VectorOfHandleToVMO output);
 
-  15: GetAnother(request<AnotherInterface> another);
+  GetAnother(request<AnotherInterface> another);
 };

webrunner/fidl/web/context.fidl

@@ -7,8 +7,8 @@ library chromium.web;
 // Manages browsing state (e.g. LocalStorage, cookies, etc) associated with
 // a set of Frames.
 interface Context {
-   // Creates a new frame under this Context.
-   //
-   // |frame|: An interface request that will be bound to the created Frame.
-   1: CreateFrame(request<Frame> frame);
+  // Creates a new frame under this Context.
+  //
+  // |frame|: An interface request that will be bound to the created Frame.
+  CreateFrame(request<Frame> frame);
 };

webrunner/fidl/web/context_provider.fidl

@@ -8,12 +8,12 @@ library chromium.web;
 // Context resources.
 [Discoverable]
 interface ContextProvider {
-   // Creates a new browser Context whose state is wholly independent and
-   // isolated from other Contexts.
-   //
-   // context: An interface request which will receive a bound Context
-   //          service.
-   1: Create(CreateContextParams params, request<Context> context);
+  // Creates a new browser Context whose state is wholly independent and
+  // isolated from other Contexts.
+  //
+  // context: An interface request which will receive a bound Context
+  //          service.
+  Create(CreateContextParams params, request<Context> context);
 };
 
 struct CreateContextParams {

webrunner/fidl/web/frame.fidl

@@ -27,14 +27,14 @@ interface Frame {
   // the view tree.
   //
   // |view_token|: Token for the new view.
-  4: CreateView2(handle<eventpair> view_token,
+  CreateView2(handle<eventpair> view_token,
                  request<fuchsia.sys.ServiceProvider>? incoming_services,
                  fuchsia.sys.ServiceProvider? outgoing_services);
 
   // Deprecated.
   // TODO(crbug.com/899348): Update all code to use CreateView2()
   // and remove CreateView().
-  1: CreateView(request<fuchsia.ui.viewsv1token.ViewOwner> view_owner,
+  CreateView(request<fuchsia.ui.viewsv1token.ViewOwner> view_owner,
                 request<fuchsia.sys.ServiceProvider>? services);
 
   // Returns an interface through which the frame may be navigated to
@@ -42,7 +42,7 @@ interface Frame {
   //
   // |view_provider|: An interface request for the Frame's
   // NavigationController.
-  2: GetNavigationController(request<NavigationController> controller);
+  GetNavigationController(request<NavigationController> controller);
 
   // Executes |script| in the frame if the frame's URL has an origin which
   // matches entries in |origins|.
@@ -65,7 +65,7 @@ interface Frame {
   // Returns |true| if the script was executed, |false| if the script was
   // rejected due to injection being blocked by the parent Context, or because
   // the script's text encoding was invalid.
-  3: ExecuteJavaScript(
+  ExecuteJavaScript(
      vector<string> origins, fuchsia.mem.Buffer script, ExecuteMode mode) ->
      (bool success);
 
@@ -78,18 +78,18 @@ interface Frame {
   // for more details on how the target origin policy is applied.
   //
   // Returns |false| if |message| is invalid or |targetOrigin| is missing.
-  5: PostMessage(WebMessage message, string targetOrigin) -> (bool success);
+  PostMessage(WebMessage message, string targetOrigin) -> (bool success);
 
   // Sets the observer for handling page navigation events.
   //
   // |observer|: The observer to use. Unregisters any existing observers
   //             if null.
-  100: SetNavigationEventObserver(NavigationEventObserver? observer);
+  SetNavigationEventObserver(NavigationEventObserver? observer);
 
   // If set to a value other than NONE, allows web content to log messages
   // to the system logger using console.log(), console.info(), console.warn(),
   // and console.error().
-  101: SetJavaScriptLogLevel(LogLevel level);
+  SetJavaScriptLogLevel(LogLevel level);
 };
 
 struct WebMessage {
@@ -118,13 +118,13 @@ union IncomingTransferable {
 // is torn down.
 interface MessagePort {
   // Sends a WebMessage to the peer.
-  1: PostMessage(WebMessage message) -> (bool success);
+  PostMessage(WebMessage message) -> (bool success);
 
   // Asynchronously reads the next message from the channel.
   // The client should invoke the callback when it is ready to process
   // another message.
   // Unreceived messages are buffered on the sender's side and bounded
   // by its available resources.
-  2: ReceiveMessage() -> (WebMessage message);
+  ReceiveMessage() -> (WebMessage message);
 };
 

webrunner/fidl/web/navigation_controller.fidl

@@ -12,16 +12,16 @@ interface NavigationController {
   // |url|:    The address to navigate to.
   // |params|: Additional parameters that affect how the resource will be
   //           loaded (e.g. cookies, HTTP headers, etc.)
-  1: LoadUrl(string url, LoadUrlParams? params);
+  LoadUrl(string url, LoadUrlParams? params);
 
-  50: GoBack();
-  51: GoForward();
-  52: Stop();
-  53: Reload(ReloadType type);
+  GoBack();
+  GoForward();
+  Stop();
+  Reload(ReloadType type);
 
   // Returns information for the currently visible content regardless of
   // loading state, or a null entry if no content is being displayed.
-  100: GetVisibleEntry() -> (NavigationEntry? entry);
+  GetVisibleEntry() -> (NavigationEntry? entry);
 };
 
 // Additional parameters for modifying the behavior of LoadUrl().

webrunner/fidl/web/navigation_event_observer.fidl

@@ -20,6 +20,6 @@ interface NavigationEventObserver {
   // creation or the last acknowledgement callback, whichever occurred later.
   // |change| will contain all the differences in navigation state since the
   // last acknowledgement.
-  1: OnNavigationStateChanged(NavigationEvent change) -> ();
+  OnNavigationStateChanged(NavigationEvent change) -> ();
 };