[gn] Run gn format on many files.

I'm going to automatically edit these files in a subsequent commit and I
don't want the formatting change to be mixed up with the functional
change.

Bug: IN-927 #comment
Test: CQ
Change-Id: Ibf619d3a419de08d1d31064e9fd2fdcca3e557f3
diff --git a/bin/basemgr/BUILD.gn b/bin/basemgr/BUILD.gn
index b5c2834..eee1163 100644
--- a/bin/basemgr/BUILD.gn
+++ b/bin/basemgr/BUILD.gn
@@ -29,11 +29,11 @@
   ]
 
   sources = [
-    "main.cc",
     "basemgr_impl.cc",
     "basemgr_impl.h",
     "basemgr_settings.cc",
     "basemgr_settings.h",
+    "main.cc",
   ]
 
   deps = [
diff --git a/bin/ledger/BUILD.gn b/bin/ledger/BUILD.gn
index 1f7c787..dc487b6 100644
--- a/bin/ledger/BUILD.gn
+++ b/bin/ledger/BUILD.gn
@@ -82,7 +82,8 @@
     },
     {
       # This test must be started by validation_firestore and will fail if started on its own.
-      path = rebase_path("tests/cloud_provider/cloud_provider_validation_tests.cmx")
+      path = rebase_path(
+              "tests/cloud_provider/cloud_provider_validation_tests.cmx")
       dest = "cloud_provider_validation_tests.cmx"
     },
   ]
diff --git a/bin/ledger/storage/impl/btree/BUILD.gn b/bin/ledger/storage/impl/btree/BUILD.gn
index 5b88d5e..22070d1 100644
--- a/bin/ledger/storage/impl/btree/BUILD.gn
+++ b/bin/ledger/storage/impl/btree/BUILD.gn
@@ -112,7 +112,6 @@
     ":lib",
     "//peridot/bin/ledger/storage/public",
   ]
-  corpora = [
-    "848002de6109d94118c57d79b2a8c0cfbd16ba8691bb390e3eb7437089ad99cc"
-  ]
+  corpora =
+      [ "848002de6109d94118c57d79b2a8c0cfbd16ba8691bb390e3eb7437089ad99cc" ]
 }
diff --git a/bin/ledger/storage/public/BUILD.gn b/bin/ledger/storage/public/BUILD.gn
index cd5d3c0..4761f5c 100644
--- a/bin/ledger/storage/public/BUILD.gn
+++ b/bin/ledger/storage/public/BUILD.gn
@@ -2,9 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-visibility = [
-  "//peridot/bin/ledger/*",
-]
+visibility = [ "//peridot/bin/ledger/*" ]
 
 source_set("public") {
   sources = [
diff --git a/bin/sessionmgr/BUILD.gn b/bin/sessionmgr/BUILD.gn
index c846eee..335c73d 100644
--- a/bin/sessionmgr/BUILD.gn
+++ b/bin/sessionmgr/BUILD.gn
@@ -66,8 +66,8 @@
     "//peridot/lib/module_manifest:module_facet_reader_impl",
     "//peridot/lib/rapidjson",
     "//peridot/lib/scoped_tmpfs",
-    "//peridot/public/fidl/fuchsia.ledger.cloud",
     "//peridot/public/fidl/fuchsia.ledger",
+    "//peridot/public/fidl/fuchsia.ledger.cloud",
     "//peridot/public/fidl/fuchsia.modular",
     "//peridot/public/fidl/fuchsia.modular.auth",
     "//peridot/public/fidl/fuchsia.modular.internal",
diff --git a/bin/sessionmgr/puppet_master/BUILD.gn b/bin/sessionmgr/puppet_master/BUILD.gn
index 7398df0..51d3cbd 100644
--- a/bin/sessionmgr/puppet_master/BUILD.gn
+++ b/bin/sessionmgr/puppet_master/BUILD.gn
@@ -120,12 +120,12 @@
   deps = [
     ":dispatch_story_command_executor",
     ":puppet_master_impl",
-    "//peridot/lib/module_manifest:module_facet_reader",
     "//peridot/bin/sessionmgr/puppet_master/command_runners:add_mod_command_runner",
     "//peridot/bin/sessionmgr/puppet_master/command_runners:focus_mod_command_runner",
     "//peridot/bin/sessionmgr/puppet_master/command_runners:remove_mod_command_runner",
     "//peridot/bin/sessionmgr/puppet_master/command_runners:set_focus_state_command_runner",
     "//peridot/bin/sessionmgr/puppet_master/command_runners:set_kind_of_proto_story_option_command_runner",
     "//peridot/bin/sessionmgr/puppet_master/command_runners:set_link_value_command_runner",
+    "//peridot/lib/module_manifest:module_facet_reader",
   ]
 }
diff --git a/bin/sessionmgr/puppet_master/command_runners/operation_calls/BUILD.gn b/bin/sessionmgr/puppet_master/command_runners/operation_calls/BUILD.gn
index 99a0dd1..3ed9d1c 100644
--- a/bin/sessionmgr/puppet_master/command_runners/operation_calls/BUILD.gn
+++ b/bin/sessionmgr/puppet_master/command_runners/operation_calls/BUILD.gn
@@ -111,4 +111,3 @@
     "//peridot/public/lib/async/cpp:operation",
   ]
 }
-
diff --git a/bin/sessionmgr/story/model/BUILD.gn b/bin/sessionmgr/story/model/BUILD.gn
index 23a845f..8941256 100644
--- a/bin/sessionmgr/story/model/BUILD.gn
+++ b/bin/sessionmgr/story/model/BUILD.gn
@@ -7,8 +7,8 @@
 # Convenience dep for most Systems.
 group("model") {
   public_deps = [
-    ":story_observer",
     ":story_mutator",
+    ":story_observer",
     "//peridot/public/fidl/fuchsia.modular.storymodel",
   ]
 }
@@ -17,6 +17,7 @@
   deps = [
     ":apply_mutations_unittest",
     ":story_model_owner_unittest",
+
     # DISALBED: FLAKY ":ledger_story_model_storage_unittest",
   ]
 }
@@ -44,8 +45,8 @@
 
 source_set("story_model_storage") {
   sources = [
-    "story_model_storage.h",
     "story_model_storage.cc",
+    "story_model_storage.h",
   ]
 
   public_deps = [
@@ -85,8 +86,8 @@
 
 source_set("noop_story_model_storage") {
   sources = [
-    "noop_story_model_storage.h",
     "noop_story_model_storage.cc",
+    "noop_story_model_storage.h",
   ]
 
   public_deps = [
@@ -101,8 +102,8 @@
 
 source_set("ledger_story_model_storage") {
   sources = [
-    "ledger_story_model_storage.h",
     "ledger_story_model_storage.cc",
+    "ledger_story_model_storage.h",
   ]
 
   public_deps = [
@@ -114,9 +115,9 @@
     ":story_model_storage",
     "//garnet/public/lib/fsl",
     "//garnet/public/lib/fxl",
+    "//peridot/lib/fidl:array_to_string",
     "//peridot/lib/ledger_client:page_client",
     "//peridot/lib/ledger_client:promise",
-    "//peridot/lib/fidl:array_to_string",
     "//peridot/public/fidl/fuchsia.ledger",
   ]
 }
@@ -147,9 +148,9 @@
   ]
 
   public_deps = [
-    "//peridot/public/fidl/fuchsia.modular.storymodel",
-    "//garnet/public/lib/fxl",
     "//garnet/public/lib/async_promise",
+    "//garnet/public/lib/fxl",
+    "//peridot/public/fidl/fuchsia.modular.storymodel",
   ]
 
   deps = [
diff --git a/bin/sessionmgr/story/systems/BUILD.gn b/bin/sessionmgr/story/systems/BUILD.gn
index c167cb3..a50db14 100644
--- a/bin/sessionmgr/story/systems/BUILD.gn
+++ b/bin/sessionmgr/story/systems/BUILD.gn
@@ -21,9 +21,9 @@
   ]
 
   deps = [
-    "//peridot/public/fidl/fuchsia.modular.storymodel",
     "//peridot/bin/sessionmgr/story:system",
     "//peridot/bin/sessionmgr/story/model",
+    "//peridot/public/fidl/fuchsia.modular.storymodel",
   ]
 }
 
@@ -38,8 +38,8 @@
     ":story_visibility_system",
     "//peridot/bin/sessionmgr/story/model",
     "//peridot/bin/sessionmgr/story/model/testing",
-    "//third_party/googletest:gtest",
     "//third_party/googletest:gmock",
+    "//third_party/googletest:gtest",
     "//third_party/googletest:gtest_main",
   ]
 }
diff --git a/bin/sessionmgr/story_runner/BUILD.gn b/bin/sessionmgr/story_runner/BUILD.gn
index 1b0b888..408454a 100644
--- a/bin/sessionmgr/story_runner/BUILD.gn
+++ b/bin/sessionmgr/story_runner/BUILD.gn
@@ -83,8 +83,8 @@
     "//peridot/bin/sessionmgr/storage",
     "//peridot/bin/sessionmgr/story:system",
     "//peridot/bin/sessionmgr/story/model",
-    "//peridot/bin/sessionmgr/story/model:story_model_owner",
     "//peridot/bin/sessionmgr/story/model:noop_story_model_storage",
+    "//peridot/bin/sessionmgr/story/model:story_model_owner",
     "//peridot/lib/fidl:clone",
     "//peridot/public/fidl/fuchsia.modular",
     "//zircon/public/lib/async-loop-cpp",
diff --git a/bin/test_driver/BUILD.gn b/bin/test_driver/BUILD.gn
index 9e048f5..f64191c 100644
--- a/bin/test_driver/BUILD.gn
+++ b/bin/test_driver/BUILD.gn
@@ -16,10 +16,10 @@
     "//garnet/public/lib/fidl/cpp",
     "//garnet/public/lib/fxl",
     "//peridot/lib/rapidjson",
-    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/lib/testing:test_driver",
     "//peridot/public/fidl/fuchsia.modular",
     "//peridot/public/lib/app_driver/cpp",
+    "//peridot/public/lib/integration_testing/cpp",
     "//zircon/public/lib/async-loop-cpp",
   ]
 
diff --git a/lib/BUILD.gn b/lib/BUILD.gn
index fb35de3..7b61a8b 100644
--- a/lib/BUILD.gn
+++ b/lib/BUILD.gn
@@ -19,8 +19,8 @@
     "//peridot/lib/module_manifest:unittests",
     "//peridot/lib/rng:unittests",
     "//peridot/lib/scoped_tmpfs:unittests",
-    "//peridot/lib/socket:unittests",
     "//peridot/lib/session_shell_settings:unittests",
+    "//peridot/lib/socket:unittests",
     "//peridot/lib/util:unittests",
     "//third_party/googletest:gtest_main",
   ]
diff --git a/lib/firebase_auth/testing/BUILD.gn b/lib/firebase_auth/testing/BUILD.gn
index bcbe5ae..b72396c 100644
--- a/lib/firebase_auth/testing/BUILD.gn
+++ b/lib/firebase_auth/testing/BUILD.gn
@@ -38,10 +38,10 @@
   testonly = true
 
   sources = [
-    "service_account_token_minter.cc",
-    "service_account_token_minter.h",
     "service_account_token_manager.cc",
     "service_account_token_manager.h",
+    "service_account_token_minter.cc",
+    "service_account_token_minter.h",
   ]
 
   public_deps = [
@@ -111,10 +111,10 @@
   sources = [
     "credentials_unittest.cc",
     "json_schema_unittest.cc",
-    "service_account_test_util.h",
     "service_account_test_util.cc",
-    "service_account_token_minter_unittest.cc",
+    "service_account_test_util.h",
     "service_account_token_manager_unittest.cc",
+    "service_account_token_minter_unittest.cc",
   ]
 
   deps = [
diff --git a/lib/module_manifest/BUILD.gn b/lib/module_manifest/BUILD.gn
index 5eea792..8f6f701 100644
--- a/lib/module_manifest/BUILD.gn
+++ b/lib/module_manifest/BUILD.gn
@@ -12,8 +12,8 @@
   testonly = true
 
   deps = [
-    ":module_manifest_xdr_unittest",
     ":module_facet_reader_impl_unittest",
+    ":module_manifest_xdr_unittest",
   ]
 }
 
@@ -34,8 +34,8 @@
   ]
 
   deps = [
-    ":module_facet_reader",
     ":json_xdr",
+    ":module_facet_reader",
     "//garnet/public/fidl/fuchsia.sys",
     "//garnet/public/lib/cmx_facet_parser",
     "//garnet/public/lib/component/cpp",
diff --git a/lib/testing/BUILD.gn b/lib/testing/BUILD.gn
index fa8a8f6..0b9ddba 100644
--- a/lib/testing/BUILD.gn
+++ b/lib/testing/BUILD.gn
@@ -106,16 +106,16 @@
   testonly = true
 
   sources = [
-    "session_shell_impl.h",
     "session_shell_impl.cc",
+    "session_shell_impl.h",
   ]
 
   public_deps = [
     "//garnet/public/fidl/fuchsia.ui.viewsv1",
+    "//garnet/public/lib/component/cpp",
     "//garnet/public/lib/fidl/cpp",
     "//garnet/public/lib/fsl",
     "//garnet/public/lib/fxl",
-    "//garnet/public/lib/component/cpp",
     "//garnet/public/lib/fxl",
     "//peridot/public/fidl/fuchsia.modular",
     "//peridot/public/lib/integration_testing/cpp",
diff --git a/public/lib/async/cpp/BUILD.gn b/public/lib/async/cpp/BUILD.gn
index 6476beb..c579ff5 100644
--- a/public/lib/async/cpp/BUILD.gn
+++ b/public/lib/async/cpp/BUILD.gn
@@ -23,8 +23,8 @@
 
   public_deps = [
     ":future",
-    "//garnet/public/lib/fxl",
     "//garnet/public/lib/async_promise",
+    "//garnet/public/lib/fxl",
   ]
 
   deps = [
diff --git a/public/lib/fostr/fidl/fuchsia.modular.storymodel/BUILD.gn b/public/lib/fostr/fidl/fuchsia.modular.storymodel/BUILD.gn
index ece1387..f90f8c9 100644
--- a/public/lib/fostr/fidl/fuchsia.modular.storymodel/BUILD.gn
+++ b/public/lib/fostr/fidl/fuchsia.modular.storymodel/BUILD.gn
@@ -8,7 +8,7 @@
   fidl_target = "//peridot/public/fidl/fuchsia.modular.storymodel"
 
   deps = [
-    "//peridot/public/lib/fostr/fidl/fuchsia.modular",
     "//garnet/public/lib/fostr/fidl/fuchsia.sys2",
+    "//peridot/public/lib/fostr/fidl/fuchsia.modular",
   ]
 }
diff --git a/public/lib/fostr/fidl/fuchsia.modular/BUILD.gn b/public/lib/fostr/fidl/fuchsia.modular/BUILD.gn
index decf530..b8ea12d 100644
--- a/public/lib/fostr/fidl/fuchsia.modular/BUILD.gn
+++ b/public/lib/fostr/fidl/fuchsia.modular/BUILD.gn
@@ -8,15 +8,15 @@
   fidl_target = "//peridot/public/fidl/fuchsia.modular"
 
   deps = [
-    "//garnet/public/lib/fostr/fidl/fuchsia.mem",
-    "//garnet/public/lib/fostr/fidl/fuchsia.images",
-    "//garnet/public/lib/fostr/fidl/fuchsia.ui.viewsv1token",
-    "//garnet/public/lib/fostr/fidl/fuchsia.ui.policy",
     "//garnet/public/lib/fostr/fidl/fuchsia.auth",
+    "//garnet/public/lib/fostr/fidl/fuchsia.images",
     "//garnet/public/lib/fostr/fidl/fuchsia.media",
-    "//peridot/public/lib/fostr/fidl/fuchsia.ledger",
-    "//peridot/public/lib/fostr/fidl/fuchsia.speech",
-    "//peridot/public/lib/fostr/fidl/fuchsia.modular.auth",
+    "//garnet/public/lib/fostr/fidl/fuchsia.mem",
+    "//garnet/public/lib/fostr/fidl/fuchsia.ui.policy",
     "//garnet/public/lib/fostr/fidl/fuchsia.ui.viewsv1",
+    "//garnet/public/lib/fostr/fidl/fuchsia.ui.viewsv1token",
+    "//peridot/public/lib/fostr/fidl/fuchsia.ledger",
+    "//peridot/public/lib/fostr/fidl/fuchsia.modular.auth",
+    "//peridot/public/lib/fostr/fidl/fuchsia.speech",
   ]
 }
diff --git a/tests/benchmarks/story/BUILD.gn b/tests/benchmarks/story/BUILD.gn
index ff63aa5..264d2db 100644
--- a/tests/benchmarks/story/BUILD.gn
+++ b/tests/benchmarks/story/BUILD.gn
@@ -50,10 +50,10 @@
     "//peridot/lib/common:names",
     "//peridot/lib/fidl:single_service_app",
     "//peridot/lib/rapidjson",
-    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/lib/testing:component_main",
     "//peridot/lib/testing:session_shell_impl",
     "//peridot/public/fidl/fuchsia.modular",
+    "//peridot/public/lib/integration_testing/cpp",
   ]
 
   sources = [
diff --git a/tests/clipboard/BUILD.gn b/tests/clipboard/BUILD.gn
index b87ad19..0cef4a8 100644
--- a/tests/clipboard/BUILD.gn
+++ b/tests/clipboard/BUILD.gn
@@ -17,15 +17,15 @@
       dest = "clipboard_test_module.cmx"
     },
   ]
-  
+
   deps = [
     ":defs",
     "//garnet/public/fidl/fuchsia.testing.runner",
     "//garnet/public/lib/fidl/cpp",
     "//garnet/public/lib/fxl",
-    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/public/fidl/fuchsia.modular",
     "//peridot/public/lib/app_driver/cpp",
+    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/tests/common:defs",
     "//zircon/public/lib/async-loop-cpp",
   ]
diff --git a/tests/common/BUILD.gn b/tests/common/BUILD.gn
index 09e099d..4e8ad87 100644
--- a/tests/common/BUILD.gn
+++ b/tests/common/BUILD.gn
@@ -26,9 +26,9 @@
   deps = [
     ":defs",
     "//garnet/public/fidl/fuchsia.ui.viewsv1",
-    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/public/fidl/fuchsia.modular",
     "//peridot/public/lib/app_driver/cpp:module_driver",
+    "//peridot/public/lib/integration_testing/cpp",
     "//zircon/public/lib/async-loop-cpp",
   ]
 }
@@ -44,7 +44,6 @@
 
   meta = [
     {
-
       path = "common_null_module.cmx"
       dest = "common_null_module.cmx"
     },
@@ -63,9 +62,9 @@
   deps = [
     ":defs",
     "//garnet/public/fidl/fuchsia.ui.viewsv1",
-    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/public/fidl/fuchsia.modular",
     "//peridot/public/lib/app_driver/cpp:module_driver",
+    "//peridot/public/lib/integration_testing/cpp",
     "//zircon/public/lib/async-loop-cpp",
   ]
 }
diff --git a/tests/component_context/BUILD.gn b/tests/component_context/BUILD.gn
index ff55743..66c9fd5 100644
--- a/tests/component_context/BUILD.gn
+++ b/tests/component_context/BUILD.gn
@@ -8,7 +8,7 @@
 executable_package("component_context_test_module") {
   testonly = true
 
-    meta = [
+  meta = [
     {
       path = "meta/component_context_test_module.cmx"
       dest = "component_context_test_module.cmx"
@@ -23,9 +23,9 @@
     ":component_context_test_service",
     ":defs",
     "//garnet/public/lib/callback",
-    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/public/fidl/fuchsia.modular",
     "//peridot/public/lib/app_driver/cpp:module_driver",
+    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/public/lib/message_queue/cpp",
     "//peridot/tests/common:defs",
     "//zircon/public/lib/async-loop-cpp",
@@ -35,7 +35,7 @@
 executable_package("component_context_test_one_agent") {
   testonly = true
 
-    meta = [
+  meta = [
     {
       path = "meta/component_context_test_one_agent.cmx"
       dest = "component_context_test_one_agent.cmx"
@@ -50,9 +50,9 @@
     ":component_context_test_service",
     ":defs",
     "//garnet/public/lib/fsl",
-    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/public/fidl/fuchsia.modular",
     "//peridot/public/lib/app_driver/cpp:agent_driver",
+    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/public/lib/message_queue/cpp",
     "//peridot/tests/common:defs",
     "//zircon/public/lib/async-loop-cpp",
@@ -62,7 +62,7 @@
 executable_package("component_context_test_two_agent") {
   testonly = true
 
-    meta = [
+  meta = [
     {
       path = "meta/component_context_test_two_agent.cmx"
       dest = "component_context_test_two_agent.cmx"
@@ -75,9 +75,9 @@
 
   deps = [
     ":defs",
-    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/public/fidl/fuchsia.modular",
     "//peridot/public/lib/app_driver/cpp:agent_driver",
+    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/tests/common:defs",
     "//zircon/public/lib/async-loop-cpp",
   ]
@@ -86,7 +86,7 @@
 executable_package("component_context_test_unstoppable_agent") {
   testonly = true
 
-    meta = [
+  meta = [
     {
       path = "meta/component_context_test_unstoppable_agent.cmx"
       dest = "component_context_test_unstoppable_agent.cmx"
@@ -99,9 +99,9 @@
 
   deps = [
     ":defs",
-    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/public/fidl/fuchsia.modular",
     "//peridot/public/lib/app_driver/cpp:agent_driver",
+    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/tests/common:defs",
     "//zircon/public/lib/async-loop-cpp",
   ]
diff --git a/tests/embed_shell/BUILD.gn b/tests/embed_shell/BUILD.gn
index 8f5b643..9ad1c6e 100644
--- a/tests/embed_shell/BUILD.gn
+++ b/tests/embed_shell/BUILD.gn
@@ -29,9 +29,9 @@
   deps = [
     ":defs",
     "//garnet/public/fidl/fuchsia.ui.viewsv1",
-    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/public/fidl/fuchsia.modular",
     "//peridot/public/lib/app_driver/cpp:module_driver",
+    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/tests/common:defs",
     "//zircon/public/lib/async-loop-cpp",
   ]
@@ -55,10 +55,10 @@
     ":defs",
     "//garnet/public/fidl/fuchsia.ui.viewsv1",
     "//garnet/public/lib/callback",
-    "//peridot/public/lib/integration_testing/cpp",
-    "//peridot/public/fidl/fuchsia.modular",
     "//peridot/lib/testing:component_main",
     "//peridot/lib/testing:session_shell_base",
+    "//peridot/public/fidl/fuchsia.modular",
+    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/tests/common:defs",
     "//zircon/public/lib/async-loop-cpp",
   ]
@@ -82,9 +82,9 @@
     ":defs",
     "//garnet/public/fidl/fuchsia.ui.viewsv1",
     "//garnet/public/lib/callback",
-    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/public/fidl/fuchsia.modular",
     "//peridot/public/lib/app_driver/cpp:module_driver",
+    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/tests/common:defs",
     "//zircon/public/lib/async-loop-cpp",
   ]
@@ -112,10 +112,10 @@
     "//garnet/public/lib/fxl",
     "//peridot/lib/fidl:array_to_string",
     "//peridot/lib/rapidjson",
-    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/lib/testing:component_base",
     "//peridot/public/fidl/fuchsia.modular",
     "//peridot/public/lib/app_driver/cpp",
+    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/tests/common:defs",
     "//zircon/public/lib/async-loop-cpp",
   ]
diff --git a/tests/intents/BUILD.gn b/tests/intents/BUILD.gn
index 7dd6eaf..6f8c2bd 100644
--- a/tests/intents/BUILD.gn
+++ b/tests/intents/BUILD.gn
@@ -29,9 +29,9 @@
   deps = [
     ":defs",
     "//garnet/public/fidl/fuchsia.ui.viewsv1",
-    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/public/fidl/fuchsia.modular",
     "//peridot/public/lib/app_driver/cpp:module_driver",
+    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/tests/common:defs",
     "//zircon/public/lib/async-loop-cpp",
   ]
@@ -55,9 +55,9 @@
     ":defs",
     "//garnet/public/fidl/fuchsia.ui.viewsv1",
     "//garnet/public/lib/callback",
-    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/public/fidl/fuchsia.modular",
     "//peridot/public/lib/app_driver/cpp:module_driver",
+    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/tests/common:defs",
     "//zircon/public/lib/async-loop-cpp",
   ]
diff --git a/tests/last_focus_time/BUILD.gn b/tests/last_focus_time/BUILD.gn
index 5ca94bc..161e3a9 100644
--- a/tests/last_focus_time/BUILD.gn
+++ b/tests/last_focus_time/BUILD.gn
@@ -36,10 +36,10 @@
     "//peridot/lib/common:story_provider_watcher_base",
     "//peridot/lib/fidl:array_to_string",
     "//peridot/lib/rapidjson",
-    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/lib/testing:component_main",
     "//peridot/lib/testing:session_shell_base",
     "//peridot/public/fidl/fuchsia.modular",
+    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/tests/common:defs",
   ]
 }
diff --git a/tests/link_context_entities/BUILD.gn b/tests/link_context_entities/BUILD.gn
index fe6a266..736db1f 100644
--- a/tests/link_context_entities/BUILD.gn
+++ b/tests/link_context_entities/BUILD.gn
@@ -35,12 +35,12 @@
     "//peridot/lib/fidl:array_to_string",
     "//peridot/lib/fidl:single_service_app",
     "//peridot/lib/rapidjson",
-    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/lib/testing:component_main",
     "//peridot/lib/testing:session_shell_base",
     "//peridot/public/fidl/fuchsia.modular",
     "//peridot/public/lib/context/cpp:context_helper",
     "//peridot/public/lib/fostr/fidl/fuchsia.modular",
+    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/tests/common:defs",
     "//zircon/public/lib/async-loop-cpp",
   ]
@@ -63,10 +63,10 @@
   deps = [
     ":defs",
     "//garnet/public/fidl/fuchsia.ui.viewsv1",
-    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/lib/testing:component_base",
     "//peridot/public/fidl/fuchsia.modular",
     "//peridot/public/lib/app_driver/cpp:module_driver",
+    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/tests/common:defs",
     "//zircon/public/lib/async-loop-cpp",
   ]
diff --git a/tests/module_context/BUILD.gn b/tests/module_context/BUILD.gn
index 49a75ff..3cb69fa 100644
--- a/tests/module_context/BUILD.gn
+++ b/tests/module_context/BUILD.gn
@@ -28,10 +28,10 @@
     "//peridot/lib/fidl:array_to_string",
     "//peridot/lib/fidl:single_service_app",
     "//peridot/lib/rapidjson",
-    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/lib/testing:component_main",
     "//peridot/lib/testing:session_shell_base",
     "//peridot/public/fidl/fuchsia.modular",
+    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/tests/common:defs",
   ]
 }
@@ -54,10 +54,10 @@
     ":defs",
     "//garnet/public/fidl/fuchsia.ui.viewsv1",
     "//peridot/lib/rapidjson",
-    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/lib/testing:component_base",
     "//peridot/public/fidl/fuchsia.modular",
     "//peridot/public/lib/app_driver/cpp:module_driver",
+    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/tests/common:defs",
     "//peridot/tests/trigger:trigger_test_service",
     "//zircon/public/lib/async-loop-cpp",
diff --git a/tests/parent_child/BUILD.gn b/tests/parent_child/BUILD.gn
index 0a971b2..31adf51 100644
--- a/tests/parent_child/BUILD.gn
+++ b/tests/parent_child/BUILD.gn
@@ -29,9 +29,9 @@
   deps = [
     ":defs",
     "//garnet/public/fidl/fuchsia.ui.viewsv1",
-    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/public/fidl/fuchsia.modular",
     "//peridot/public/lib/app_driver/cpp:module_driver",
+    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/tests/common:defs",
     "//zircon/public/lib/async-loop-cpp",
   ]
@@ -54,9 +54,9 @@
   deps = [
     ":defs",
     "//garnet/public/fidl/fuchsia.ui.viewsv1",
-    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/public/fidl/fuchsia.modular",
     "//peridot/public/lib/app_driver/cpp:module_driver",
+    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/tests/common:defs",
     "//zircon/public/lib/async-loop-cpp",
   ]
@@ -80,9 +80,9 @@
     ":defs",
     "//garnet/public/fidl/fuchsia.ui.viewsv1",
     "//garnet/public/lib/callback",
-    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/public/fidl/fuchsia.modular",
     "//peridot/public/lib/app_driver/cpp:module_driver",
+    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/tests/common:defs",
     "//zircon/public/lib/async-loop-cpp",
   ]
diff --git a/tests/queue_persistence/BUILD.gn b/tests/queue_persistence/BUILD.gn
index bc0a5ab..23267e2 100644
--- a/tests/queue_persistence/BUILD.gn
+++ b/tests/queue_persistence/BUILD.gn
@@ -31,9 +31,9 @@
     ":defs",
     ":queue_persistence_test_service",
     "//garnet/public/lib/callback",
-    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/public/fidl/fuchsia.modular",
     "//peridot/public/lib/app_driver/cpp:module_driver",
+    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/public/lib/message_queue/cpp",
     "//peridot/tests/common:defs",
     "//zircon/public/lib/async-loop-cpp",
@@ -57,9 +57,9 @@
   deps = [
     ":defs",
     ":queue_persistence_test_service",
-    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/public/fidl/fuchsia.modular",
     "//peridot/public/lib/app_driver/cpp:agent_driver",
+    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/public/lib/message_queue/cpp",
     "//peridot/tests/common:defs",
     "//zircon/public/lib/async-loop-cpp",
diff --git a/tests/session_shell/BUILD.gn b/tests/session_shell/BUILD.gn
index 2f98ed8..a669070 100644
--- a/tests/session_shell/BUILD.gn
+++ b/tests/session_shell/BUILD.gn
@@ -34,10 +34,10 @@
     "//garnet/public/lib/fsl",
     "//garnet/public/lib/fxl",
     "//peridot/lib/rapidjson",
-    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/lib/testing:component_main",
     "//peridot/lib/testing:session_shell_base",
     "//peridot/public/fidl/fuchsia.modular",
+    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/tests/common:defs",
   ]
 }
diff --git a/tests/story_shell/BUILD.gn b/tests/story_shell/BUILD.gn
index e44c3b1..0fb4401 100644
--- a/tests/story_shell/BUILD.gn
+++ b/tests/story_shell/BUILD.gn
@@ -38,10 +38,10 @@
     "//peridot/lib/fidl:array_to_string",
     "//peridot/lib/fidl:clone",
     "//peridot/lib/rapidjson",
-    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/lib/testing:component_base",
     "//peridot/public/fidl/fuchsia.modular",
     "//peridot/public/lib/app_driver/cpp",
+    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/tests/common:defs",
   ]
 }
@@ -72,11 +72,11 @@
     "//peridot/lib/fidl:array_to_string",
     "//peridot/lib/fidl:clone",
     "//peridot/lib/rapidjson",
-    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/lib/testing:component_main",
     "//peridot/lib/testing:session_shell_base",
     "//peridot/public/fidl/fuchsia.modular",
     "//peridot/public/lib/app_driver/cpp",
+    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/tests/common:defs",
   ]
 }
diff --git a/tests/suggestion/BUILD.gn b/tests/suggestion/BUILD.gn
index ec5a925..675109b 100644
--- a/tests/suggestion/BUILD.gn
+++ b/tests/suggestion/BUILD.gn
@@ -29,10 +29,10 @@
   deps = [
     ":defs",
     "//garnet/public/lib/callback",
-    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/lib/testing:component_base",
     "//peridot/public/fidl/fuchsia.modular",
     "//peridot/public/lib/app_driver/cpp:module_driver",
+    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/tests/common:defs",
     "//zircon/public/lib/async-loop-cpp",
   ]
@@ -54,10 +54,10 @@
 
   deps = [
     ":defs",
-    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/lib/testing:component_main",
     "//peridot/lib/testing:session_shell_base",
     "//peridot/public/fidl/fuchsia.modular",
+    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/tests/common:defs",
   ]
 }
diff --git a/tests/trigger/BUILD.gn b/tests/trigger/BUILD.gn
index d04f6ee..beca454 100644
--- a/tests/trigger/BUILD.gn
+++ b/tests/trigger/BUILD.gn
@@ -34,10 +34,10 @@
     "//garnet/public/lib/fidl/cpp",
     "//garnet/public/lib/fxl",
     "//peridot/lib/rapidjson",
-    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/lib/testing:component_main",
     "//peridot/lib/testing:session_shell_base",
     "//peridot/public/fidl/fuchsia.modular",
+    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/tests/common:defs",
   ]
 }
@@ -60,9 +60,9 @@
     ":defs",
     ":trigger_test_service",
     "//garnet/public/lib/callback",
-    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/public/fidl/fuchsia.modular",
     "//peridot/public/lib/app_driver/cpp:module_driver",
+    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/public/lib/message_queue/cpp",
     "//peridot/tests/common:defs",
     "//zircon/public/lib/async-loop-cpp",
@@ -86,9 +86,9 @@
   deps = [
     ":defs",
     ":trigger_test_service",
-    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/public/fidl/fuchsia.modular",
     "//peridot/public/lib/app_driver/cpp:agent_driver",
+    "//peridot/public/lib/integration_testing/cpp",
     "//peridot/tests/common:defs",
     "//zircon/public/lib/async-loop-cpp",
   ]