From 5923ff4900f4c37e7512027985754a1a567f8bdf Mon Sep 17 00:00:00 2001
From: George Kulakowski <kulakowski@google.com>
Date: Fri, 15 Sep 2017 20:28:49 +0000
Subject: [PATCH] Reorder Fuchsia file headers and gn format

These were left out of order by the mechanical changes that were part
of Fuchsia's Magenta->Zircon rename.

Change-Id: I41c81eb889c6076ffe82102018721e5abc74e7ac
Reviewed-on: https://dart-review.googlesource.com/6165
Reviewed-by: Zach Anderson <zra@google.com>
---
 BUILD.gn                             |  3 +--
 runtime/bin/eventhandler_fuchsia.cc  |  8 ++++----
 runtime/bin/eventhandler_fuchsia.h   |  6 +++---
 runtime/bin/extensions_fuchsia.cc    |  2 +-
 runtime/bin/file_fuchsia.cc          |  2 +-
 runtime/bin/platform_fuchsia.cc      |  6 +++---
 runtime/bin/process_fuchsia.cc       | 14 +++++++-------
 runtime/vm/os_thread_fuchsia.h       |  2 +-
 runtime/vm/timeline_fuchsia.cc       |  2 +-
 runtime/vm/virtual_memory_fuchsia.cc |  4 ++--
 10 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index 6ae71b4a708..74c317e4fcd 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -171,8 +171,7 @@ if (is_fuchsia) {
       zircon_bootdata =
           "//out/build-zircon/build-zircon-qemu-arm64/bootdata.bin"
     } else if (current_cpu == "x64") {
-      zircon_bootdata =
-          "//out/build-zircon/build-zircon-pc-x86-64/bootdata.bin"
+      zircon_bootdata = "//out/build-zircon/build-zircon-pc-x86-64/bootdata.bin"
     } else {
       assert(false, "unable to determine path to zircon's bootdata.bin")
     }
diff --git a/runtime/bin/eventhandler_fuchsia.cc b/runtime/bin/eventhandler_fuchsia.cc
index 9025c68c26f..d464d525521 100644
--- a/runtime/bin/eventhandler_fuchsia.cc
+++ b/runtime/bin/eventhandler_fuchsia.cc
@@ -10,10 +10,6 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <zircon/status.h>
-#include <zircon/syscalls.h>
-#include <zircon/syscalls/object.h>
-#include <zircon/syscalls/port.h>
 #include <fdio/private.h>
 #include <poll.h>
 #include <pthread.h>
@@ -22,6 +18,10 @@
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <zircon/status.h>
+#include <zircon/syscalls.h>
+#include <zircon/syscalls/object.h>
+#include <zircon/syscalls/port.h>
 
 #include "bin/fdutils.h"
 #include "bin/lockers.h"
diff --git a/runtime/bin/eventhandler_fuchsia.h b/runtime/bin/eventhandler_fuchsia.h
index 4cceb00c04e..50f45204a32 100644
--- a/runtime/bin/eventhandler_fuchsia.h
+++ b/runtime/bin/eventhandler_fuchsia.h
@@ -10,13 +10,13 @@
 #endif
 
 #include <errno.h>
+#include <fdio/private.h>
+#include <sys/socket.h>
+#include <unistd.h>
 #include <zircon/status.h>
 #include <zircon/syscalls.h>
 #include <zircon/syscalls/object.h>
 #include <zircon/syscalls/port.h>
-#include <fdio/private.h>
-#include <sys/socket.h>
-#include <unistd.h>
 
 #include "bin/reference_counting.h"
 #include "bin/thread.h"
diff --git a/runtime/bin/extensions_fuchsia.cc b/runtime/bin/extensions_fuchsia.cc
index 0a251ca2980..540963f31f3 100644
--- a/runtime/bin/extensions_fuchsia.cc
+++ b/runtime/bin/extensions_fuchsia.cc
@@ -9,9 +9,9 @@
 
 #include <dlfcn.h>
 #include <fcntl.h>
+#include <fdio/io.h>
 #include <launchpad/vmo.h>
 #include <zircon/dlfcn.h>
-#include <fdio/io.h>
 
 #include "platform/assert.h"
 
diff --git a/runtime/bin/file_fuchsia.cc b/runtime/bin/file_fuchsia.cc
index 3b5c5c5b19c..181a8acc98d 100644
--- a/runtime/bin/file_fuchsia.cc
+++ b/runtime/bin/file_fuchsia.cc
@@ -9,8 +9,8 @@
 
 #include <errno.h>           // NOLINT
 #include <fcntl.h>           // NOLINT
-#include <libgen.h>          // NOLINT
 #include <fdio/namespace.h>  // NOLINT
+#include <libgen.h>          // NOLINT
 #include <sys/mman.h>        // NOLINT
 #include <sys/stat.h>        // NOLINT
 #include <sys/types.h>       // NOLINT
diff --git a/runtime/bin/platform_fuchsia.cc b/runtime/bin/platform_fuchsia.cc
index 09066191abc..cda405eab84 100644
--- a/runtime/bin/platform_fuchsia.cc
+++ b/runtime/bin/platform_fuchsia.cc
@@ -7,12 +7,12 @@
 
 #include "bin/platform.h"
 
-#include <zircon/process.h>
-#include <zircon/status.h>
-#include <zircon/syscalls.h>
 #include <string.h>
 #include <sys/utsname.h>
 #include <unistd.h>
+#include <zircon/process.h>
+#include <zircon/status.h>
+#include <zircon/syscalls.h>
 
 #include "bin/dartutils.h"
 #include "bin/fdutils.h"
diff --git a/runtime/bin/process_fuchsia.cc b/runtime/bin/process_fuchsia.cc
index 050c9a8d472..26004ed91be 100644
--- a/runtime/bin/process_fuchsia.cc
+++ b/runtime/bin/process_fuchsia.cc
@@ -9,17 +9,12 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <launchpad/launchpad.h>
-#include <launchpad/vmo.h>
-#include <zircon/process.h>
-#include <zircon/status.h>
-#include <zircon/syscalls.h>
-#include <zircon/syscalls/object.h>
-#include <zircon/types.h>
 #include <fdio/io.h>
 #include <fdio/namespace.h>
 #include <fdio/private.h>
 #include <fdio/util.h>
+#include <launchpad/launchpad.h>
+#include <launchpad/vmo.h>
 #include <poll.h>
 #include <pthread.h>
 #include <stdbool.h>
@@ -27,6 +22,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <zircon/process.h>
+#include <zircon/status.h>
+#include <zircon/syscalls.h>
+#include <zircon/syscalls/object.h>
+#include <zircon/types.h>
 
 #include "bin/dartutils.h"
 #include "bin/eventhandler.h"
diff --git a/runtime/vm/os_thread_fuchsia.h b/runtime/vm/os_thread_fuchsia.h
index 73c5cbb1781..da76e8e0951 100644
--- a/runtime/vm/os_thread_fuchsia.h
+++ b/runtime/vm/os_thread_fuchsia.h
@@ -9,8 +9,8 @@
 #error Do not include os_thread_fuchsia.h directly; use os_thread.h instead.
 #endif
 
-#include <zircon/syscalls/object.h>
 #include <pthread.h>
+#include <zircon/syscalls/object.h>
 
 #include "platform/assert.h"
 #include "platform/globals.h"
diff --git a/runtime/vm/timeline_fuchsia.cc b/runtime/vm/timeline_fuchsia.cc
index 5bfe39c10a2..696e12187e0 100644
--- a/runtime/vm/timeline_fuchsia.cc
+++ b/runtime/vm/timeline_fuchsia.cc
@@ -5,9 +5,9 @@
 #include "platform/globals.h"
 #if defined(HOST_OS_FUCHSIA) && !defined(PRODUCT)
 
-#include <zircon/syscalls.h>
 #include <trace-engine/context.h>
 #include <trace-engine/instrumentation.h>
+#include <zircon/syscalls.h>
 
 #include "platform/utils.h"
 #include "vm/object.h"
diff --git a/runtime/vm/virtual_memory_fuchsia.cc b/runtime/vm/virtual_memory_fuchsia.cc
index a9d1638d268..e0417376a56 100644
--- a/runtime/vm/virtual_memory_fuchsia.cc
+++ b/runtime/vm/virtual_memory_fuchsia.cc
@@ -7,11 +7,11 @@
 
 #include "vm/virtual_memory.h"
 
+#include <sys/mman.h>
+#include <unistd.h>
 #include <zircon/process.h>
 #include <zircon/status.h>
 #include <zircon/syscalls.h>
-#include <sys/mman.h>
-#include <unistd.h>
 
 #include "platform/assert.h"
 #include "vm/allocation.h"