Fix header guards in various dirs

Generated mechanically as follows:

git ls-files '*.h' | grep -E '^(sandbox|services|skia|testing|ui|url)/' |\
grep -v third_party |\
parallel --xargs cpplint.py --filter=-,+build/header_guard -- 2>&1 |\
grep build/header | tools/apply_cpplint_header_guard.py

Bug: 1200694
Change-Id: Ifdae80663b18c885777e82231a3fce259ec120f4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3029526
Reviewed-by: Dirk Pranke <dpranke@google.com>
Reviewed-by: Chris Palmer <palmer@chromium.org>
Reviewed-by: Stephen White <senorblanco@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Henrique Ferreiro <hferreiro@igalia.com>
Commit-Queue: Sumaid <ssyed@igalia.com>
Cr-Commit-Position: refs/heads/master@{#910172}

sandbox/policy/linux/bpf_service_policy_linux.h

@@ -29,4 +29,4 @@ class ServiceProcessPolicy : public BPFBasePolicy {
 }  // namespace policy
 }  // namespace sandbox
 
-#endif  // SERVICES_SERVICE_MANAGER_SANDBOX_LINUX_BPF_SERVICE_POLICY_LINUX_H_
+#endif  // SANDBOX_POLICY_LINUX_BPF_SERVICE_POLICY_LINUX_H_

services/network/public/cpp/bfcache_opt_in_parser.h

@@ -18,4 +18,4 @@ bool ParseBFCacheOptInUnload(base::StringPiece header_value);
 
 }  // namespace network
 
-#endif  // SERVICES_NETWORK_BFCACHE_OPT_IN_PARSER_H_
+#endif  // SERVICES_NETWORK_PUBLIC_CPP_BFCACHE_OPT_IN_PARSER_H_

skia/ext/skia_matrix_44.h

@@ -400,4 +400,4 @@ class SK_API Matrix44 {
 
 }  // namespace skia
 
-#endif
+#endif  // SKIA_EXT_SKIA_MATRIX_44_H_

testing/libfuzzer/fuzzers/color_space_data.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef TESTING_LIBFUZZER_FUZZERS_COLOR_SPACE_DATA_H
-#define TESTING_LIBFUZZER_FUZZERS_COLOR_SPACE_DATA_H
+#ifndef TESTING_LIBFUZZER_FUZZERS_COLOR_SPACE_DATA_H_
+#define TESTING_LIBFUZZER_FUZZERS_COLOR_SPACE_DATA_H_
 
 static const uint8_t kSRGBData[] = {
     // sRGB profile with tabular gamma curves.
@@ -376,4 +376,4 @@ static const uint8_t kAdobeData[] = {
     0x00, 0x00, 0x10, 0x2f, 0x00, 0x00, 0xbe, 0x9c,
 };
 
-#endif  // TESTING_LIBFUZZER_FUZZERS_COLOR_SPACE_DATA_H
+#endif  // TESTING_LIBFUZZER_FUZZERS_COLOR_SPACE_DATA_H_

testing/libfuzzer/fuzzers/javascript_parser_proto_to_string.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef TESTING_LIBFUZZER_FUZZERS_JAVASCRIPT_PARSER_PROTO_TO_STRING_H
-#define TESTING_LIBFUZZER_FUZZERS_JAVASCRIPT_PARSER_PROTO_TO_STRING_H
+#ifndef TESTING_LIBFUZZER_FUZZERS_JAVASCRIPT_PARSER_PROTO_TO_STRING_H_
+#define TESTING_LIBFUZZER_FUZZERS_JAVASCRIPT_PARSER_PROTO_TO_STRING_H_
 
 #include "javascript_parser.pb.h"  // from out/gen
 
@@ -12,4 +12,4 @@
 std::string token_to_string(const javascript_parser_proto_fuzzer::Token& token,
                             int depth);
 
-#endif  // TESTING_LIBFUZZER_FUZZERS_JAVASCRIPT_PARSER_PROTO_TO_STRING_H
+#endif  // TESTING_LIBFUZZER_FUZZERS_JAVASCRIPT_PARSER_PROTO_TO_STRING_H_

ui/base/ime/generate_character_composer_data.py

@@ -430,6 +430,7 @@ def main(argv):
     out.write('//   FROM {}\n\n'.format(' '.join(args.inputs)))
     guard = args.guard if args.guard else args.output
     guard = ''.join([c.upper() if c.isalpha() else '_' for c in guard])
+    guard = 'UI_BASE_IME_' + guard
     out.write('#ifndef {0}_\n#define {0}_\n'.format(guard))
     Assembler(args, parse_tree).Write(out)
     out.write('#endif  // {}_\n'.format(guard))

ui/base/metadata/base_type_conversion.h

@@ -380,4 +380,4 @@ EXPORT_ENUM_CONVERTERS(gfx::ElideBehavior, COMPONENT_EXPORT(UI_BASE_METADATA))
 EXPORT_ENUM_CONVERTERS(ui::MenuSeparatorType,
                        COMPONENT_EXPORT(UI_BASE_METADATA))
 
-#endif  // UI_BASE_METDATA_BASE_TYPE_CONVERSION_H_
+#endif  // UI_BASE_METADATA_BASE_TYPE_CONVERSION_H_

ui/gfx/ipc/buffer_types/gfx_ipc_export.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef GFX_IPC_BUFFER_TYPES_EXPORT_H_
-#define GFX_IPC_BUFFER_TYPES_EXPORT_H_
+#ifndef UI_GFX_IPC_BUFFER_TYPES_GFX_IPC_EXPORT_H_
+#define UI_GFX_IPC_BUFFER_TYPES_GFX_IPC_EXPORT_H_
 
 #if defined(COMPONENT_BUILD)
 #if defined(WIN32)
@@ -26,4 +26,4 @@
 #define GFX_IPC_BUFFER_TYPES_EXPORT
 #endif
 
-#endif  // GFX_IPC_BUFFER_TYPES_EXPORT_H_
+#endif  // UI_GFX_IPC_BUFFER_TYPES_GFX_IPC_EXPORT_H_

ui/gfx/ipc/color/gfx_ipc_color_export.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef GFX_IPC_COLOR_EXPORT_H_
-#define GFX_IPC_COLOR_EXPORT_H_
+#ifndef UI_GFX_IPC_COLOR_GFX_IPC_COLOR_EXPORT_H_
+#define UI_GFX_IPC_COLOR_GFX_IPC_COLOR_EXPORT_H_
 
 #if defined(COMPONENT_BUILD)
 #if defined(WIN32)
@@ -26,4 +26,4 @@
 #define GFX_IPC_COLOR_EXPORT
 #endif
 
-#endif  // GFX_IPC_COLOR_EXPORT_H_
+#endif  // UI_GFX_IPC_COLOR_GFX_IPC_COLOR_EXPORT_H_

ui/gfx/ipc/geometry/gfx_ipc_geometry_export.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef GFX_IPC_GEOMETRY_EXPORT_H_
-#define GFX_IPC_GEOMETRY_EXPORT_H_
+#ifndef UI_GFX_IPC_GEOMETRY_GFX_IPC_GEOMETRY_EXPORT_H_
+#define UI_GFX_IPC_GEOMETRY_GFX_IPC_GEOMETRY_EXPORT_H_
 
 #if defined(COMPONENT_BUILD)
 #if defined(WIN32)
@@ -26,4 +26,4 @@
 #define GFX_IPC_GEOMETRY_EXPORT
 #endif
 
-#endif  // GFX_IPC_GEOMETRY_EXPORT_H_
+#endif  // UI_GFX_IPC_GEOMETRY_GFX_IPC_GEOMETRY_EXPORT_H_

ui/gfx/ipc/gfx_ipc_export.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef GFX_IPC_EXPORT_H_
-#define GFX_IPC_EXPORT_H_
+#ifndef UI_GFX_IPC_GFX_IPC_EXPORT_H_
+#define UI_GFX_IPC_GFX_IPC_EXPORT_H_
 
 #if defined(COMPONENT_BUILD)
 #if defined(WIN32)
@@ -26,4 +26,4 @@
 #define GFX_IPC_EXPORT
 #endif
 
-#endif  // GFX_IPC_EXPORT_H_
+#endif  // UI_GFX_IPC_GFX_IPC_EXPORT_H_

ui/gfx/ipc/skia/gfx_skia_ipc_export.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_GFX_IPC_GFX_SKIA_IPC_EXPORT_H_
-#define UI_GFX_IPC_GFX_SKIA_IPC_EXPORT_H_
+#ifndef UI_GFX_IPC_SKIA_GFX_SKIA_IPC_EXPORT_H_
+#define UI_GFX_IPC_SKIA_GFX_SKIA_IPC_EXPORT_H_
 
 #if defined(COMPONENT_BUILD)
 #if defined(WIN32)
@@ -26,4 +26,4 @@
 #define GFX_SKIA_IPC_EXPORT
 #endif
 
-#endif  // UI_GFX_IPC_GFX_SKIA_IPC_EXPORT_H_
+#endif  // UI_GFX_IPC_SKIA_GFX_SKIA_IPC_EXPORT_H_

ui/gfx/ipc/skia/gfx_skia_param_traits.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_GFX_IPC_GFX_SKIA_PARAM_TRAITS_H_
-#define UI_GFX_IPC_GFX_SKIA_PARAM_TRAITS_H_
+#ifndef UI_GFX_IPC_SKIA_GFX_SKIA_PARAM_TRAITS_H_
+#define UI_GFX_IPC_SKIA_GFX_SKIA_PARAM_TRAITS_H_
 
 #include <string>
 
@@ -58,4 +58,4 @@ struct GFX_SKIA_IPC_EXPORT ParamTraits<gfx::Transform> {
 
 }  // namespace IPC
 
-#endif  // UI_GFX_IPC_GFX_SKIA_PARAM_TRAITS_H_
+#endif  // UI_GFX_IPC_SKIA_GFX_SKIA_PARAM_TRAITS_H_

ui/gl/EGL/eglextchromium.h

@@ -4,8 +4,8 @@
 
 // This file contains Chromium-specific EGL extensions declarations.
 
-#ifndef GPU_EGL_EGLEXTCHROMIUM_H_
-#define GPU_EGL_EGLEXTCHROMIUM_H_
+#ifndef UI_GL_EGL_EGLEXTCHROMIUM_H_
+#define UI_GL_EGL_EGLEXTCHROMIUM_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -47,4 +47,4 @@ typedef EGLBoolean(EGLAPIENTRYP PFNEGLGETMSCRATEANGLEPROC)(EGLDisplay dpy,
 }
 #endif
 
-#define  // GPU_EGL_EGLEXTCHROMIUM_H_
+#define  // UI_GL_EGL_EGLEXTCHROMIUM_H_

ui/gl/generate_bindings.py

@@ -3086,7 +3086,7 @@ class GLContext;
         (func['known_as'], set_name.lower(), func['known_as']))
 
   file.write('\n')
-  file.write('#endif  //  UI_GL_GL_BINDINGS_AUTOGEN_%s_H_\n' %
+  file.write('#endif  // UI_GL_GL_BINDINGS_AUTOGEN_%s_H_\n' %
       set_name.upper())
 
 
@@ -3152,8 +3152,8 @@ def GenerateStubHeader(file, functions):
   file.write(LICENSE_AND_HEADER +
 """
 
-#ifndef UI_GL_GL_STUB_AUTOGEN_H_
-#define UI_GL_GL_STUB_AUTOGEN_H_
+#ifndef UI_GL_GL_STUB_AUTOGEN_GL_H_
+#define UI_GL_GL_STUB_AUTOGEN_GL_H_
 
 """)
 
@@ -3172,7 +3172,7 @@ def GenerateStubHeader(file, functions):
       file.write(';\n');
 
   file.write('\n')
-  file.write('#endif  //  UI_GL_GL_STUB_AUTOGEN_H_')
+  file.write('#endif  //  UI_GL_GL_STUB_AUTOGEN_GL_H_')
 
 def GenerateStubSource(file, functions):
   """Generates gl_stub_autogen_gl.cc"""

url/ipc/url_ipc_export.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef URL_IPC_EXPORT_H_
-#define URL_IPC_EXPORT_H_
+#ifndef URL_IPC_URL_IPC_EXPORT_H_
+#define URL_IPC_URL_IPC_EXPORT_H_
 
 #if defined(COMPONENT_BUILD)
 #if defined(WIN32)
@@ -26,4 +26,4 @@
 #define URL_IPC_EXPORT
 #endif
 
-#endif  // URL_IPC_EXPORT_H_
+#endif  // URL_IPC_URL_IPC_EXPORT_H_

url/mojom/origin_mojom_traits.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef URL_MOJO_ORIGIN_MOJOM_TRAITS_H_
-#define URL_MOJO_ORIGIN_MOJOM_TRAITS_H_
+#ifndef URL_MOJOM_ORIGIN_MOJOM_TRAITS_H_
+#define URL_MOJOM_ORIGIN_MOJOM_TRAITS_H_
 
 #include "base/component_export.h"
 #include "base/unguessable_token.h"
@@ -36,4 +36,4 @@ struct COMPONENT_EXPORT(URL_MOJOM_TRAITS)
 
 }  // namespace mojo
 
-#endif  // URL_MOJO_ORIGIN_MOJOM_TRAITS_H_
+#endif  // URL_MOJOM_ORIGIN_MOJOM_TRAITS_H_