Roll GN 83dad00a:97cc440d

https://gn.googlesource.com/gn/+log/83dad00a..97cc440d
97cc440 format: Fix not getting to fixed point in one step
d874bb9 Remove extraneous quotation marks
201a0b5 format: Fix single line list suffix comments being dropped
c367761 format: Improve suffix comment handling
564de29 Format all .gn and .gni files of examples

This changes the formatting of a couple gn files, so reformat
all gn files for this again (and manually tweak comments in a
few cases where things look weird otherwise).

TBR=creis

Bug: 1046505
Change-Id: I79924a5eb8e03af9a69bf944301897287eba06e2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2025529
Commit-Queue: Nico Weber <thakis@chromium.org>
Reviewed-by: Hans Wennborg <hans@chromium.org>
Cr-Commit-Position: refs/heads/master@{#736036}

BUILD.gn

@@ -522,7 +522,8 @@ group("gn_all") {
         "//media/cast:generate_timecode_audio",
         "//net:crash_cache",
         "//net:dns_fuzz_stub",
-        "//net:net_watcher",  # TODO(GYP): This should be conditional on use_v8_in_net
+        "//net:net_watcher",  # TODO(GYP): This should be conditional on
+                              # use_v8_in_net
         "//net:run_testserver",
         "//net:stress_cache",
         "//net:tld_cleanup",

DEPS

@@ -339,7 +339,7 @@ vars = {
   # revisions.
 
   # GN CIPD package version.
-  'gn_version': 'git_revision:83dad00afb232d7235dd70dff1ee90292d72a01e',
+  'gn_version': 'git_revision:97cc440d84f050f99ff0161f9414bfa2ffa38f65',
 
   # Also, if you change these, update buildtools/DEPS too. Also update the
   # libc++ svn_revision in //buildtools/deps_revisions.gni.

build/toolchain/mac/BUILD.gn

@@ -274,7 +274,8 @@ template("mac_toolchain") {
     }
 
     tool("solink") {
-      dylib = "{{output_dir}}/{{target_output_name}}{{output_extension}}"  # eg "./libfoo.dylib"
+      # E.g. "./libfoo.dylib":
+      dylib = "{{output_dir}}/{{target_output_name}}{{output_extension}}"
       rspfile = dylib + ".rsp"
       pool = "//build/toolchain:link_pool($default_toolchain)"
 
@@ -345,7 +346,8 @@ template("mac_toolchain") {
     }
 
     tool("solink_module") {
-      sofile = "{{output_dir}}/{{target_output_name}}{{output_extension}}"  # eg "./libfoo.so"
+      # E.g. "./libfoo.so":
+      sofile = "{{output_dir}}/{{target_output_name}}{{output_extension}}"
       rspfile = sofile + ".rsp"
       pool = "//build/toolchain:link_pool($default_toolchain)"
 

build/toolchain/win/BUILD.gn

@@ -123,7 +123,8 @@ template("msvc_toolchain") {
     # passing in a list of include directories isn't enough.
     if (defined(invoker.sys_include_flags)) {
       env_wrapper = ""
-      sys_include_flags = "${invoker.sys_include_flags} "  # Note trailing space.
+      sys_include_flags =
+          "${invoker.sys_include_flags} "  # Note trailing space.
     } else {
       # clang-cl doesn't need this env hoop, so omit it there.
       assert((defined(toolchain_args.is_clang) && !toolchain_args.is_clang) ||
@@ -136,7 +137,7 @@ template("msvc_toolchain") {
     # mt.exe in PATH on non-Windows, so it's not needed there anyways.
     if (host_os != "win") {
       linker_wrapper = ""
-      sys_lib_flags = "${invoker.sys_lib_flags} "  # Note trailing space
+      sys_lib_flags = "${invoker.sys_lib_flags} "  # Note trailing space.
     } else if (defined(invoker.sys_lib_flags)) {
       # Invoke ninja as wrapper instead of tool wrapper, because python
       # invocation requires higher cpu usage compared to ninja invocation, and
@@ -144,10 +145,11 @@ template("msvc_toolchain") {
       # TODO(thakis): Remove wrapper once lld-link can merge manifests without
       # relying on mt.exe being in %PATH% on Windows, https://crbug.com/872740
       linker_wrapper = "ninja -t msvc -e $env -- "  # Note trailing space.
-      sys_lib_flags = "${invoker.sys_lib_flags} "  # Note trailing space
+      sys_lib_flags = "${invoker.sys_lib_flags} "  # Note trailing space.
     } else {
+      # Note trailing space:
       linker_wrapper =
-          "$python_path $tool_wrapper_path link-wrapper $env False "  # Note trailing space.
+          "$python_path $tool_wrapper_path link-wrapper $env False "
       sys_lib_flags = ""
     }
 
@@ -268,7 +270,8 @@ template("msvc_toolchain") {
     }
 
     tool("solink") {
-      dllname = "{{output_dir}}/{{target_output_name}}{{output_extension}}"  # e.g. foo.dll
+      # E.g. "foo.dll":
+      dllname = "{{output_dir}}/{{target_output_name}}{{output_extension}}"
       libname = "${dllname}.lib"  # e.g. foo.dll.lib
       pdbname = "${dllname}.pdb"
       rspfile = "${dllname}.rsp"
@@ -302,7 +305,9 @@ template("msvc_toolchain") {
     }
 
     tool("solink_module") {
-      dllname = "{{output_dir}}/{{target_output_name}}{{output_extension}}"  # e.g. foo.dll
+      dllname =
+          "{{output_dir}}/{{target_output_name}}{{output_extension}}"  # e.g.
+                                                                       # foo.dll
       pdbname = "${dllname}.pdb"
       rspfile = "${dllname}.rsp"
       pool = "//build/toolchain:link_pool($default_toolchain)"

buildtools/DEPS

@@ -14,7 +14,7 @@ vars = {
   #
 
   # GN CIPD package version.
-  'gn_version': 'git_revision:83dad00afb232d7235dd70dff1ee90292d72a01e',
+  'gn_version': 'git_revision:97cc440d84f050f99ff0161f9414bfa2ffa38f65',
 
   # When changing these, also update the svn revisions in deps_revisions.gni
   'clang_format_revision': '96636aa0e9f047f17447f2d45a094d0b59ed7917',

chrome/BUILD.gn

@@ -1081,7 +1081,8 @@ if (is_win) {
     if (is_chrome_branded) {
       framework_contents += [ "Default Apps" ]
       if (enable_keystone_registration_framework) {
-        framework_contents += [ "Frameworks" ]  # For KeystoneRegistration.framework.
+        framework_contents +=
+            [ "Frameworks" ]  # For KeystoneRegistration.framework.
       }
     }
 

chrome/android/chrome_public_apk_tmpl.gni

@@ -225,7 +225,7 @@ template("chrome_public_common_apk_or_module_tmpl") {
         if (!defined(negative_main_dex_globs)) {
           negative_main_dex_globs = [
             "*ApplicationStatus*",  # Doesn't work in non-browser process.
-            "*ChromeActivity*",  # Pulls in the world, so ensure it doesn't slip in.
+            "*ChromeActivity*",  # Pulls in the world; ensure it stays out.
             "*GoogleApiAvailability*",  # Play Services only in browser process.
             "*R\$*",  # Should not use resources from non-browser process.
           ]

chrome/browser/BUILD.gn

@@ -55,9 +55,9 @@ if (is_win) {
       "cryptui.lib",
       "dwmapi.lib",
       "netapi32.lib",
-      "ndfapi.lib",  # Used by browser/net/net_error_diagnostics_dialog_win.h
-      "pdh.lib",  # Used by browser/private_working_set_snapshot.h
-      "wbemuuid.lib",  # Used by browser/metrics/antivirus_metrics_provider_win.cc
+      "ndfapi.lib",  # For browser/net/net_error_diagnostics_dialog_win.h
+      "pdh.lib",  # For browser/private_working_set_snapshot.h
+      "wbemuuid.lib",  # For browser/metrics/antivirus_metrics_provider_win.cc
     ]
     ldflags = [
       "/DELAYLOAD:ndfapi.dll",
@@ -2977,7 +2977,7 @@ jumbo_static_library("browser") {
       "//components/payments/content/android",
       "//components/resources:components_resources",
       "//components/send_tab_to_self",
-      "//components/signin/internal/identity_manager",  # see android/signin/DEPS
+      "//components/signin/internal/identity_manager",  # cf android/signin/DEPS
       "//media/mojo/clients",
       "//rlz:rlz_utils",
       "//sandbox",
@@ -3564,7 +3564,9 @@ jumbo_static_library("browser") {
       "signin/signin_promo.h",
       "signin/signin_ui_util.cc",
       "signin/signin_ui_util.h",
-      "speech/extension_api/tts_extension_api_constants.cc",  # Should be moved to extensions section?
+      "speech/extension_api/tts_extension_api_constants.cc",  # Should be moved
+                                                              # to extensions
+                                                              # section?
       "speech/extension_api/tts_extension_api_constants.h",
       "ssl/ssl_client_auth_observer.cc",
       "ssl/ssl_client_auth_observer.h",

chrome/browser/android/vr/BUILD.gn

@@ -249,6 +249,7 @@ test("vr_android_unittests") {
     "//testing/android/native_test:native_test_native_code",
     "//testing/gmock",
     "//testing/gtest",
-    "//ui/android:ui_java",  # TODO: Remove once http://crbug.com/951419 is fixed!
+    "//ui/android:ui_java",  # TODO: Remove once http://crbug.com/951419 is
+                             # fixed!
   ]
 }

components/sync_device_info/BUILD.gn

@@ -56,7 +56,7 @@ jumbo_static_library("sync_device_info") {
   if (is_mac) {
     libs = [
       "CoreFoundation.framework",
-      "SystemConfiguration.framework",  # Required by local_device_info_util_mac.mm.
+      "SystemConfiguration.framework",  # For local_device_info_util_mac.mm.
     ]
   }
 

device/gamepad/BUILD.gn

@@ -107,7 +107,8 @@ component("gamepad") {
   defines = [ "DEVICE_GAMEPAD_IMPLEMENTATION" ]
 
   if (is_win) {
-    cflags = [ "/wd4267" ]  # conversion from 'size_t' (64 bit) to 'type'(32 bit).
+    cflags =
+        [ "/wd4267" ]  # conversion from 'size_t' (64 bit) to 'type'(32 bit).
   }
 
   if (is_linux) {

gpu/khronos_glcts_support/BUILD.gn

@@ -381,7 +381,8 @@ if (internal_khronos_glcts_tests) {
 
     public_deps = [ ":qphelper" ]
 
-    include_dirs = [ "//third_party/khronos_glcts/framework/delibs/libpng" ]  #png.hpp
+    include_dirs =
+        [ "//third_party/khronos_glcts/framework/delibs/libpng" ]  # png.hpp
 
     configs += [ ":defaults_config" ]
     configs -= [ "//build/config/compiler:chromium_code" ]

skia/BUILD.gn

@@ -198,7 +198,8 @@ config("skia_library_config") {
                   # assembly code contains flow control(jmp or jcc) statements.
 
       "/wd4800",  # forcing value to bool 'true/false'(assigning int to bool).
-      "/wd5041",  # out-of-line definition for constexpr static data member is not needed and is deprecated in C++17
+      "/wd5041",  # out-of-line definition for constexpr static data member is
+                  # not needed and is deprecated in C++17
     ]
     cflags_cc = [ "/std:c++17" ]
   } else {
@@ -643,7 +644,8 @@ template("skia_source_set") {
     if (is_win) {
       cflags_cc = [
         "/std:c++17",
-        "/wd5041",  # out-of-line definition for constexpr static data member is not needed and is deprecated in C++17
+        "/wd5041",  # out-of-line definition for constexpr static data member is
+                    # not needed and is deprecated in C++17
       ]
     } else {
       cflags_cc = [ "-std=c++17" ]

third_party/blink/renderer/bindings/scripts/scripts.gni

@@ -159,7 +159,9 @@ template("idl_compiler") {
   # "import site" to speed up startup. Figure out if we need this and do
   # something similar (not really expressible in GN now).
   _script = "//third_party/blink/renderer/bindings/scripts/idl_compiler.py"
-  _inputs = idl_lexer_parser_files + idl_compiler_files  # to be explicit (covered by parsetab)
+  _inputs =
+      idl_lexer_parser_files + idl_compiler_files  # to be explicit (covered by
+                                                   # parsetab)
   _inputs += [
     "$bindings_scripts_output_dir/lextab.py",
     "$bindings_scripts_output_dir/parsetab.pickle",
@@ -248,7 +250,9 @@ template("idl_impl") {
     idl_files_list = "$target_gen_dir/${target_name}_file_list.tmp"
     write_file(idl_files_list, rebase_path(invoker.dict_idls, root_build_dir))
 
-    inputs = idl_lexer_parser_files + idl_compiler_files  # to be explicit (covered by parsetab)
+    inputs =
+        idl_lexer_parser_files + idl_compiler_files  # to be explicit (covered
+                                                     # by parsetab)
     inputs += [
       "$bindings_scripts_output_dir/lextab.py",
       "$bindings_scripts_output_dir/parsetab.pickle",

third_party/blink/renderer/core/core_idl_files.gni

@@ -793,7 +793,8 @@ core_static_dependency_idl_files =
     core_dependency_idl_files + webcore_testing_dependency_idl_files
 
 # Generated IDL files
-core_generated_interface_idl_files = generated_webcore_testing_idl_files  # interfaces
+core_generated_interface_idl_files =
+    generated_webcore_testing_idl_files  # interfaces
 core_generated_dependency_idl_files =
     core_global_constructors_generated_idl_files  # partial interfaces
 

third_party/blink/renderer/core/html/BUILD.gn

@@ -580,7 +580,8 @@ blink_core_sources("html") {
     "window_name_collection.h",
   ]
 
-  jumbo_excluded_sources = [ "canvas/canvas_rendering_context.cc" ]  # https://crbug.com/716395
+  jumbo_excluded_sources =
+      [ "canvas/canvas_rendering_context.cc" ]  # https://crbug.com/716395
 
   deps = [
     "//services/metrics/public/cpp:metrics_cpp",

third_party/blink/renderer/modules/BUILD.gn

@@ -182,7 +182,8 @@ jumbo_component("modules") {
   }
 
   if (is_win) {
-    cflags = [ "/wd4334" ]  # Result of 32-bit shift implicitly converted to 64 bits.
+    cflags =
+        [ "/wd4334" ]  # Result of 32-bit shift implicitly converted to 64 bits.
   }
 
   configs -= [ "//build/config/compiler:default_symbols" ]

third_party/crashpad/crashpad/tools/BUILD.gn

@@ -89,7 +89,8 @@ if (!crashpad_is_fuchsia) {
     }
 
     if (crashpad_is_win) {
-      cflags = [ "/wd4201" ]  # nonstandard extension used : nameless struct/union
+      cflags =
+          [ "/wd4201" ]  # nonstandard extension used : nameless struct/union
     }
   }
 }

third_party/inspector_protocol/inspector_protocol.gni

@@ -58,7 +58,8 @@ template("inspector_protocol_generate") {
 
     args = [
       "--jinja_dir",
-      rebase_path("//third_party/", root_build_dir),  # jinja is in chromium's third_party
+      rebase_path("//third_party/", root_build_dir),  # jinja is in chromium's
+                                                      # third_party
       "--output_base",
       rebase_path(invoker.out_dir, root_build_dir),
       "--config",

tools/grit/grit_rule.gni

@@ -93,7 +93,7 @@ import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/config/ui.gni")
-import("//build/toolchain/gcc_toolchain.gni")  # For enable_resource_whitelist_generation
+import("//build/toolchain/gcc_toolchain.gni")
 if (enable_resource_whitelist_generation) {
   assert(target_os == "android" || target_os == "win",
          "unsupported platform for resource whitelist generation")

tools/imagediff/BUILD.gn

@@ -34,7 +34,8 @@ if (target_os == "win" && host_os != "win") {
 # If the current toolchain is the test host toolchain, build the tool.
 if (current_toolchain == imagediff_toolchain) {
   executable("imagediff") {
-    output_name = "image_diff"  # Different than dir name for historical reasons.
+    output_name = "image_diff"  # Different than dir name for historical
+                                # reasons.
     sources = [
       "image_diff.cc",
       "image_diff_png.cc",

ui/base/BUILD.gn

@@ -561,8 +561,8 @@ jumbo_component("base") {
       "cursor/cursor_loader_win.h",
     ]
     deps += [ "//third_party/wtl" ]
-    cflags = [ "/wd4324" ]  # Structure was padded due to __declspec(align()), which is
-                            # uninteresting.
+    cflags = [ "/wd4324" ]  # Structure was padded due to __declspec(align()),
+                            # which is uninteresting.
 
     ldflags = [
       "/DELAYLOAD:d2d1.dll",