From 513c02fea7335f6a1d41183e98008027534443ed Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Tue, 21 Jan 2020 18:03:43 +0000 Subject: [PATCH] Reformat all gn files in /services/ `gn format` recently changed its formatting behavior for deps, source, and a few other elements when they are assigned (with =) single-element lists to be consistent with the formatting of updates (with +=) with single-element. Now that we've rolled in a GN binary with the change, reformat all files so that people don't get presubmit warnings due to this. This CL was uploaded by me. Bug: 1041419 Change-Id: Ie111379ff7ac2c7ef371dd354f82c11e3ebe85aa Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2012641 Auto-Submit: Nico Weber Reviewed-by: Colin Blundell Reviewed-by: Will Harris Commit-Queue: Will Harris Cr-Commit-Position: refs/heads/master@{#733660} --- services/BUILD.gn | 4 +--- services/data_decoder/BUILD.gn | 24 +++++-------------- services/data_decoder/public/cpp/BUILD.gn | 21 +++++----------- services/device/bluetooth/BUILD.gn | 8 ++----- services/device/fingerprint/BUILD.gn | 4 +--- services/device/wake_lock/BUILD.gn | 4 +--- .../wake_lock/power_save_blocker/BUILD.gn | 16 ++++--------- services/image_annotation/BUILD.gn | 4 +--- services/image_annotation/public/cpp/BUILD.gn | 4 +--- .../image_annotation/public/mojom/BUILD.gn | 4 +--- services/metrics/public/cpp/BUILD.gn | 4 +--- services/metrics/public/mojom/BUILD.gn | 8 ++----- services/network/BUILD.gn | 8 ++----- services/network/public/cpp/BUILD.gn | 20 ++++------------ services/network/public/mojom/BUILD.gn | 12 +++------- .../cpp/memory_instrumentation/BUILD.gn | 4 +--- services/service_manager/sandbox/BUILD.gn | 4 +--- services/test/BUILD.gn | 14 ++++------- services/test/echo/public/mojom/BUILD.gn | 4 +--- services/test/user_id/public/mojom/BUILD.gn | 8 ++----- services/video_capture/BUILD.gn | 4 +--- services/video_capture/public/cpp/BUILD.gn | 4 +--- services/video_capture/public/mojom/BUILD.gn | 4 +--- services/video_capture/public/uma/BUILD.gn | 4 +--- 24 files changed, 50 insertions(+), 145 deletions(-) diff --git a/services/BUILD.gn b/services/BUILD.gn index 00ae3d4793160f..ada65653fb0652 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -152,8 +152,6 @@ if (is_android) { "//third_party/junit", "//ui/gfx/geometry/mojom:mojom_java", ] - data = [ - "test/data/", - ] + data = [ "test/data/" ] } } diff --git a/services/data_decoder/BUILD.gn b/services/data_decoder/BUILD.gn index c59d28d13c14d2..45ff0f11c79703 100644 --- a/services/data_decoder/BUILD.gn +++ b/services/data_decoder/BUILD.gn @@ -38,9 +38,7 @@ source_set("lib") { "//ui/gfx/geometry", ] - public_deps = [ - "//services/data_decoder/public/mojom", - ] + public_deps = [ "//services/data_decoder/public/mojom" ] if (!is_ios) { sources += [ @@ -88,9 +86,7 @@ source_set("tests") { "//gin:gin_test", "//third_party/blink/public:blink", ] - data_deps = [ - "//tools/v8_context_snapshot", - ] + data_deps = [ "//tools/v8_context_snapshot" ] configs += [ "//tools/v8_context_snapshot:use_v8_context_snapshot", "//v8:external_startup_data", @@ -99,9 +95,7 @@ source_set("tests") { } fuzzer_test("web_bundle_parser_fuzzer") { - sources = [ - "web_bundle_parser_fuzzer.cc", - ] + sources = [ "web_bundle_parser_fuzzer.cc" ] deps = [ ":lib", "//base", @@ -111,9 +105,7 @@ fuzzer_test("web_bundle_parser_fuzzer") { } fuzzer_test("xml_parser_fuzzer") { - sources = [ - "xml_parser_fuzzer.cc", - ] + sources = [ "xml_parser_fuzzer.cc" ] deps = [ ":lib", "//base", @@ -126,11 +118,7 @@ fuzzer_test("xml_parser_fuzzer") { if (is_chromeos) { fuzzer_test("ble_scan_parser_fuzzer") { - sources = [ - "ble_scan_parser_impl_fuzzer.cc", - ] - deps = [ - ":lib", - ] + sources = [ "ble_scan_parser_impl_fuzzer.cc" ] + deps = [ ":lib" ] } } diff --git a/services/data_decoder/public/cpp/BUILD.gn b/services/data_decoder/public/cpp/BUILD.gn index 69f3a065139953..4dd89896df9772 100644 --- a/services/data_decoder/public/cpp/BUILD.gn +++ b/services/data_decoder/public/cpp/BUILD.gn @@ -8,13 +8,9 @@ import("//mojo/public/tools/bindings/mojom.gni") # converted to a component target. A component target is necessary for # ServiceProvider because it exposes global storage. component("service_provider") { - public = [ - "service_provider.h", - ] + public = [ "service_provider.h" ] - sources = [ - "service_provider.cc", - ] + sources = [ "service_provider.cc" ] public_deps = [ "//base", @@ -51,9 +47,8 @@ source_set("cpp") { if (is_android) { sources += [ "json_sanitizer_android.cc" ] - deps = [ - "//services/data_decoder/public/cpp/android:safe_json_jni_headers", - ] + deps = + [ "//services/data_decoder/public/cpp/android:safe_json_jni_headers" ] } else { sources += [ "json_sanitizer_non_android.cc" ] } @@ -62,9 +57,7 @@ source_set("cpp") { # NOTE: We depend on this target here for iOS only, to support in-process # use of the service. Non-test targets in this directory should otherwise # NEVER depend on this target. - deps = [ - "//services/data_decoder:lib", - ] + deps = [ "//services/data_decoder:lib" ] } else { public += [ "decode_image.h", @@ -88,9 +81,7 @@ source_set("test_support") { "test_support/web_bundle_builder.h", ] - deps = [ - "//components/cbor", - ] + deps = [ "//components/cbor" ] public_deps = [ ":cpp", diff --git a/services/device/bluetooth/BUILD.gn b/services/device/bluetooth/BUILD.gn index b5fe1f1e62c462..7b27ba91d6f55c 100644 --- a/services/device/bluetooth/BUILD.gn +++ b/services/device/bluetooth/BUILD.gn @@ -17,9 +17,7 @@ source_set("bluetooth_system") { "bluetooth_system_factory.h", ] - public_deps = [ - "//services/device/public/mojom", - ] + public_deps = [ "//services/device/public/mojom" ] deps = [ "//base", @@ -31,9 +29,7 @@ source_set("bluetooth_system") { source_set("bluetooth_system_tests") { testonly = true - sources = [ - "bluetooth_system_unittest.cc", - ] + sources = [ "bluetooth_system_unittest.cc" ] deps = [ ":bluetooth_system", diff --git a/services/device/fingerprint/BUILD.gn b/services/device/fingerprint/BUILD.gn index e8079a91549cf1..5a39e5bdf84f74 100644 --- a/services/device/fingerprint/BUILD.gn +++ b/services/device/fingerprint/BUILD.gn @@ -33,7 +33,5 @@ component("fingerprint") { sources += [ "fingerprint_default.cc" ] } - public_deps = [ - "//services/device/public/mojom", - ] + public_deps = [ "//services/device/public/mojom" ] } diff --git a/services/device/wake_lock/BUILD.gn b/services/device/wake_lock/BUILD.gn index 1dec49d5cf14ee..23fe2f9b7216a3 100644 --- a/services/device/wake_lock/BUILD.gn +++ b/services/device/wake_lock/BUILD.gn @@ -21,7 +21,5 @@ source_set("wake_lock") { "//ui/gfx", ] - deps = [ - "//services/device/wake_lock/power_save_blocker", - ] + deps = [ "//services/device/wake_lock/power_save_blocker" ] } diff --git a/services/device/wake_lock/power_save_blocker/BUILD.gn b/services/device/wake_lock/power_save_blocker/BUILD.gn index 310bbcdcefcd79..af81c2e4511280 100644 --- a/services/device/wake_lock/power_save_blocker/BUILD.gn +++ b/services/device/wake_lock/power_save_blocker/BUILD.gn @@ -20,17 +20,11 @@ source_set("power_save_blocker") { "//services/device/wake_lock:*", ] - sources = [ - "power_save_blocker.h", - ] + sources = [ "power_save_blocker.h" ] - public_deps = [ - "//services/device/public/mojom", - ] + public_deps = [ "//services/device/public/mojom" ] - deps = [ - "//base", - ] + deps = [ "//base" ] if (use_dbus) { deps += [ "//dbus" ] @@ -90,8 +84,6 @@ if (is_android) { "//services/device:*", ] sources = java_sources_needing_jni - deps = [ - "//base:base_java", - ] + deps = [ "//base:base_java" ] } } diff --git a/services/image_annotation/BUILD.gn b/services/image_annotation/BUILD.gn index 436d1f677cc8b1..24a69d5e0d64e7 100644 --- a/services/image_annotation/BUILD.gn +++ b/services/image_annotation/BUILD.gn @@ -45,9 +45,7 @@ source_set("service") { source_set("tests") { testonly = true - sources = [ - "annotator_unittest.cc", - ] + sources = [ "annotator_unittest.cc" ] deps = [ ":lib", diff --git a/services/image_annotation/public/cpp/BUILD.gn b/services/image_annotation/public/cpp/BUILD.gn index ca63856a613bed..8e864e989fa1af 100644 --- a/services/image_annotation/public/cpp/BUILD.gn +++ b/services/image_annotation/public/cpp/BUILD.gn @@ -20,9 +20,7 @@ source_set("cpp") { source_set("tests") { testonly = true - sources = [ - "image_processor_unittest.cc", - ] + sources = [ "image_processor_unittest.cc" ] deps = [ ":cpp", diff --git a/services/image_annotation/public/mojom/BUILD.gn b/services/image_annotation/public/mojom/BUILD.gn index 4e6bd52a3cabe5..4eb0e6f82ccc91 100644 --- a/services/image_annotation/public/mojom/BUILD.gn +++ b/services/image_annotation/public/mojom/BUILD.gn @@ -5,7 +5,5 @@ import("//mojo/public/tools/bindings/mojom.gni") mojom("mojom") { - sources = [ - "image_annotation.mojom", - ] + sources = [ "image_annotation.mojom" ] } diff --git a/services/metrics/public/cpp/BUILD.gn b/services/metrics/public/cpp/BUILD.gn index 6eff85e7864db8..68bfc8ee1522ca 100644 --- a/services/metrics/public/cpp/BUILD.gn +++ b/services/metrics/public/cpp/BUILD.gn @@ -66,9 +66,7 @@ action("gen_ukm_builders") { "//tools/metrics/ukm/codegen.py", "//tools/metrics/ukm/gen_builders.py", ] - sources = [ - "//tools/metrics/ukm/ukm.xml", - ] + sources = [ "//tools/metrics/ukm/ukm.xml" ] outdir = "$target_gen_dir" diff --git a/services/metrics/public/mojom/BUILD.gn b/services/metrics/public/mojom/BUILD.gn index 4713382e26df07..ace0b430741828 100644 --- a/services/metrics/public/mojom/BUILD.gn +++ b/services/metrics/public/mojom/BUILD.gn @@ -5,11 +5,7 @@ import("//mojo/public/tools/bindings/mojom.gni") mojom("mojom") { - sources = [ - "ukm_interface.mojom", - ] + sources = [ "ukm_interface.mojom" ] - public_deps = [ - "//url/mojom:url_mojom_gurl", - ] + public_deps = [ "//url/mojom:url_mojom_gurl" ] } diff --git a/services/network/BUILD.gn b/services/network/BUILD.gn index 49115e0f587dd3..f5350932be8b30 100644 --- a/services/network/BUILD.gn +++ b/services/network/BUILD.gn @@ -245,9 +245,7 @@ jumbo_component("network_service") { "//url", ] - public_deps = [ - "//services/network/public/cpp:buildflags", - ] + public_deps = [ "//services/network/public/cpp:buildflags" ] if (is_ct_supported) { sources += [ @@ -473,9 +471,7 @@ jumbo_source_set("test_support") { } fuzzer_test("network_content_security_policy_fuzzer") { - sources = [ - "content_security_policy_fuzzer.cc", - ] + sources = [ "content_security_policy_fuzzer.cc" ] deps = [ "//base", "//net", diff --git a/services/network/public/cpp/BUILD.gn b/services/network/public/cpp/BUILD.gn index 5546dd8fea3110..e949d8735f7c5c 100644 --- a/services/network/public/cpp/BUILD.gn +++ b/services/network/public/cpp/BUILD.gn @@ -185,12 +185,8 @@ jumbo_component("cpp_base") { } mojom("test_interfaces") { - sources = [ - "network_traits_test_service.mojom", - ] - public_deps = [ - "//services/network/public/mojom", - ] + sources = [ "network_traits_test_service.mojom" ] + public_deps = [ "//services/network/public/mojom" ] } source_set("tests") { @@ -246,16 +242,10 @@ source_set("tests") { "//testing/gtest", ] - public_deps = [ - ":buildflags", - ] + public_deps = [ ":buildflags" ] } fuzzer_test("cors_fuzzer") { - sources = [ - "cors/cors_fuzzer.cc", - ] - deps = [ - ":cpp", - ] + sources = [ "cors/cors_fuzzer.cc" ] + deps = [ ":cpp" ] } diff --git a/services/network/public/mojom/BUILD.gn b/services/network/public/mojom/BUILD.gn index 74e526c84d08a7..9ec954872d5023 100644 --- a/services/network/public/mojom/BUILD.gn +++ b/services/network/public/mojom/BUILD.gn @@ -18,9 +18,7 @@ mojom("mojom_ip_address") { "ip_endpoint.mojom", ] - public_deps = [ - "//url/mojom:url_mojom_gurl", - ] + public_deps = [ "//url/mojom:url_mojom_gurl" ] } # As with mojom_ip_address, this is a separate target to avoid a circular @@ -30,13 +28,9 @@ mojom("mojom_ip_address") { # depending on that and don't need this. mojom("mojom_network_isolation_key") { generate_java = true - sources = [ - "network_isolation_key.mojom", - ] + sources = [ "network_isolation_key.mojom" ] - public_deps = [ - "//url/mojom:url_mojom_origin", - ] + public_deps = [ "//url/mojom:url_mojom_origin" ] if (!is_ios) { export_class_attribute_blink = "BLINK_PLATFORM_EXPORT" diff --git a/services/resource_coordinator/public/cpp/memory_instrumentation/BUILD.gn b/services/resource_coordinator/public/cpp/memory_instrumentation/BUILD.gn index 777587457d15c6..603f9215ba4fb2 100644 --- a/services/resource_coordinator/public/cpp/memory_instrumentation/BUILD.gn +++ b/services/resource_coordinator/public/cpp/memory_instrumentation/BUILD.gn @@ -50,7 +50,5 @@ source_set("browser") { "browser_metrics.h", ] - deps = [ - "//base", - ] + deps = [ "//base" ] } diff --git a/services/service_manager/sandbox/BUILD.gn b/services/service_manager/sandbox/BUILD.gn index 13340bdfd4703a..1ee6a62444d74d 100644 --- a/services/service_manager/sandbox/BUILD.gn +++ b/services/service_manager/sandbox/BUILD.gn @@ -20,9 +20,7 @@ component("sandbox") { "switches.h", ] defines = [ "SERVICE_MANAGER_SANDBOX_IMPL" ] - public_deps = [ - "//services/service_manager/embedder:embedder_switches", - ] + public_deps = [ "//services/service_manager/embedder:embedder_switches" ] deps = [ ":sanitizer_buildflags", "//base", diff --git a/services/test/BUILD.gn b/services/test/BUILD.gn index 76aa1a4cf75323..9f50070b1f3f42 100644 --- a/services/test/BUILD.gn +++ b/services/test/BUILD.gn @@ -11,9 +11,7 @@ source_set("run_all_unittests") { testonly = true - sources = [ - "run_all_unittests.cc", - ] + sources = [ "run_all_unittests.cc" ] deps = [ "//base", @@ -25,9 +23,7 @@ source_set("run_all_unittests") { if (is_ios) { deps += [ ":tests_bundle_data" ] } else { - data = [ - "data/", - ] + data = [ "data/" ] } data_deps = [ @@ -65,8 +61,6 @@ bundle_data("tests_bundle_data") { "//services/test/data/simple_page.html", "//services/test/data/title1.html", ] - outputs = [ - "{{bundle_resources_dir}}/" + - "{{source_root_relative_dir}}/{{source_file_part}}", - ] + outputs = [ "{{bundle_resources_dir}}/" + + "{{source_root_relative_dir}}/{{source_file_part}}" ] } diff --git a/services/test/echo/public/mojom/BUILD.gn b/services/test/echo/public/mojom/BUILD.gn index f0d5d4cfeddd12..3d10b85f9737ef 100644 --- a/services/test/echo/public/mojom/BUILD.gn +++ b/services/test/echo/public/mojom/BUILD.gn @@ -6,7 +6,5 @@ import("//mojo/public/tools/bindings/mojom.gni") mojom("mojom") { generate_java = true - sources = [ - "echo.mojom", - ] + sources = [ "echo.mojom" ] } diff --git a/services/test/user_id/public/mojom/BUILD.gn b/services/test/user_id/public/mojom/BUILD.gn index c6e8f2314fa584..615c838ea58e90 100644 --- a/services/test/user_id/public/mojom/BUILD.gn +++ b/services/test/user_id/public/mojom/BUILD.gn @@ -5,10 +5,6 @@ import("//mojo/public/tools/bindings/mojom.gni") mojom("mojom") { - sources = [ - "user_id.mojom", - ] - public_deps = [ - "//mojo/public/mojom/base", - ] + sources = [ "user_id.mojom" ] + public_deps = [ "//mojo/public/mojom/base" ] } diff --git a/services/video_capture/BUILD.gn b/services/video_capture/BUILD.gn index 5cda90b65484d3..b61adf3543e5dc 100644 --- a/services/video_capture/BUILD.gn +++ b/services/video_capture/BUILD.gn @@ -50,9 +50,7 @@ source_set("lib") { "//services/viz/public/cpp/gpu", ] - deps = [ - "//media/capture:capture_switches", - ] + deps = [ "//media/capture:capture_switches" ] if (is_chromeos) { public_deps += [ "//media/capture/video/chromeos/mojom:cros_camera" ] diff --git a/services/video_capture/public/cpp/BUILD.gn b/services/video_capture/public/cpp/BUILD.gn index 83f37e5b109efd..8cead26e449729 100644 --- a/services/video_capture/public/cpp/BUILD.gn +++ b/services/video_capture/public/cpp/BUILD.gn @@ -17,9 +17,7 @@ source_set("cpp") { "//services/video_capture/public/mojom", ] - deps = [ - "//mojo/public/cpp/bindings:bindings", - ] + deps = [ "//mojo/public/cpp/bindings:bindings" ] } source_set("mocks") { diff --git a/services/video_capture/public/mojom/BUILD.gn b/services/video_capture/public/mojom/BUILD.gn index 4807a002a72a20..a31b4253ff344c 100644 --- a/services/video_capture/public/mojom/BUILD.gn +++ b/services/video_capture/public/mojom/BUILD.gn @@ -35,7 +35,5 @@ mojom("mojom") { } mojom("constants") { - sources = [ - "constants.mojom", - ] + sources = [ "constants.mojom" ] } diff --git a/services/video_capture/public/uma/BUILD.gn b/services/video_capture/public/uma/BUILD.gn index 838e7c1b58730e..4baaff6d341537 100644 --- a/services/video_capture/public/uma/BUILD.gn +++ b/services/video_capture/public/uma/BUILD.gn @@ -8,7 +8,5 @@ source_set("uma") { "video_capture_service_event.h", ] - public_deps = [ - "//base", - ] + public_deps = [ "//base" ] }