flutter · auto-submit · Dec 14, 2023 · Dec 14, 2023 · Dec 14, 2023 · Dec 14, 2023
diff --git a/shell/common/dl_op_spy.h b/shell/common/dl_op_spy.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 FLUTTER_DISPLAY_LIST_DL_OP_SPY_H_
-#define FLUTTER_DISPLAY_LIST_DL_OP_SPY_H_
+#ifndef FLUTTER_SHELL_COMMON_DL_OP_SPY_H_
+#define FLUTTER_SHELL_COMMON_DL_OP_SPY_H_
 
 #include "flutter/display_list/dl_op_receiver.h"
 #include "flutter/display_list/utils/dl_receiver_utils.h"
@@ -109,4 +109,4 @@ class DlOpSpy final : public virtual DlOpReceiver,
 
 }  // namespace flutter
 
-#endif  // FLUTTER_DISPLAY_LIST_DL_OP_SPY_H_
+#endif  // FLUTTER_SHELL_COMMON_DL_OP_SPY_H_
diff --git a/shell/common/engine.h b/shell/common/engine.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 SHELL_COMMON_ENGINE_H_
-#define SHELL_COMMON_ENGINE_H_
+#ifndef FLUTTER_SHELL_COMMON_ENGINE_H_
+#define FLUTTER_SHELL_COMMON_ENGINE_H_
 
 #include <memory>
 #include <string>
@@ -1039,4 +1039,4 @@ class Engine final : public RuntimeDelegate, PointerDataDispatcher::Delegate {
 
 }  // namespace flutter
 
-#endif  // SHELL_COMMON_ENGINE_H_
+#endif  // FLUTTER_SHELL_COMMON_ENGINE_H_
diff --git a/shell/common/platform_message_handler.h b/shell/common/platform_message_handler.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 SHELL_COMMON_PLATFORM_MESSAGE_HANDLER_H_
-#define SHELL_COMMON_PLATFORM_MESSAGE_HANDLER_H_
+#ifndef FLUTTER_SHELL_COMMON_PLATFORM_MESSAGE_HANDLER_H_
+#define FLUTTER_SHELL_COMMON_PLATFORM_MESSAGE_HANDLER_H_
 
 #include <memory>
 
@@ -45,4 +45,4 @@ class PlatformMessageHandler {
 };
 }  // namespace flutter
 
-#endif  // SHELL_COMMON_PLATFORM_MESSAGE_HANDLER_H_
+#endif  // FLUTTER_SHELL_COMMON_PLATFORM_MESSAGE_HANDLER_H_
diff --git a/shell/common/platform_view.h b/shell/common/platform_view.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 COMMON_PLATFORM_VIEW_H_
-#define COMMON_PLATFORM_VIEW_H_
+#ifndef FLUTTER_SHELL_COMMON_PLATFORM_VIEW_H_
+#define FLUTTER_SHELL_COMMON_PLATFORM_VIEW_H_
 
 #include <functional>
 #include <memory>
@@ -881,4 +881,4 @@ class PlatformView {
 
 }  // namespace flutter
 
-#endif  // COMMON_PLATFORM_VIEW_H_
+#endif  // FLUTTER_SHELL_COMMON_PLATFORM_VIEW_H_
diff --git a/shell/common/pointer_data_dispatcher.h b/shell/common/pointer_data_dispatcher.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 POINTER_DATA_DISPATCHER_H_
-#define POINTER_DATA_DISPATCHER_H_
+#ifndef FLUTTER_SHELL_COMMON_POINTER_DATA_DISPATCHER_H_
+#define FLUTTER_SHELL_COMMON_POINTER_DATA_DISPATCHER_H_
 
 #include "flutter/runtime/runtime_controller.h"
 #include "flutter/shell/common/animator.h"
@@ -174,4 +174,4 @@ using PointerDataDispatcherMaker =
 
 }  // namespace flutter
 
-#endif  // POINTER_DATA_DISPATCHER_H_
+#endif  // FLUTTER_SHELL_COMMON_POINTER_DATA_DISPATCHER_H_
diff --git a/shell/common/rasterizer.h b/shell/common/rasterizer.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 SHELL_COMMON_RASTERIZER_H_
-#define SHELL_COMMON_RASTERIZER_H_
+#ifndef FLUTTER_SHELL_COMMON_RASTERIZER_H_
+#define FLUTTER_SHELL_COMMON_RASTERIZER_H_
 
 #include <memory>
 #include <optional>
@@ -735,4 +735,4 @@ class Rasterizer final : public SnapshotDelegate,
 
 }  // namespace flutter
 
-#endif  // SHELL_COMMON_RASTERIZER_H_
+#endif  // FLUTTER_SHELL_COMMON_RASTERIZER_H_
diff --git a/shell/common/shell.h b/shell/common/shell.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 SHELL_COMMON_SHELL_H_
-#define SHELL_COMMON_SHELL_H_
+#ifndef FLUTTER_SHELL_COMMON_SHELL_H_
+#define FLUTTER_SHELL_COMMON_SHELL_H_
 
 #include <functional>
 #include <mutex>
@@ -815,4 +815,4 @@ class Shell final : public PlatformView::Delegate,
 
 }  // namespace flutter
 
-#endif  // SHELL_COMMON_SHELL_H_
+#endif  // FLUTTER_SHELL_COMMON_SHELL_H_
diff --git a/shell/common/shell_test_external_view_embedder.h b/shell/common/shell_test_external_view_embedder.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 FLUTTER_SHELL_TEST_EXTERNAL_VIEW_EMBEDDER_H_
-#define FLUTTER_SHELL_TEST_EXTERNAL_VIEW_EMBEDDER_H_
+#ifndef FLUTTER_SHELL_COMMON_SHELL_TEST_EXTERNAL_VIEW_EMBEDDER_H_
+#define FLUTTER_SHELL_COMMON_SHELL_TEST_EXTERNAL_VIEW_EMBEDDER_H_
 
 #include "flutter/flow/embedded_views.h"
 #include "flutter/fml/raster_thread_merger.h"
@@ -111,4 +111,4 @@ class ShellTestExternalViewEmbedder final : public ExternalViewEmbedder {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_TEST_EXTERNAL_VIEW_EMBEDDER_H_
+#endif  // FLUTTER_SHELL_COMMON_SHELL_TEST_EXTERNAL_VIEW_EMBEDDER_H_
diff --git a/shell/common/shell_test_platform_view.h b/shell/common/shell_test_platform_view.h
@@ -66,4 +66,4 @@ class ShellTestPlatformViewBuilder {
 }  // namespace testing
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_COMMON_SHELL_TEST_PLATFORM_VIEW_GL_H_
+#endif  // FLUTTER_SHELL_COMMON_SHELL_TEST_PLATFORM_VIEW_H_
diff --git a/shell/common/snapshot_surface_producer.h b/shell/common/snapshot_surface_producer.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 SHELL_COMMON_SNAPSHOT_SURFACE_PRODUCER_H_
-#define SHELL_COMMON_SNAPSHOT_SURFACE_PRODUCER_H_
+#ifndef FLUTTER_SHELL_COMMON_SNAPSHOT_SURFACE_PRODUCER_H_
+#define FLUTTER_SHELL_COMMON_SNAPSHOT_SURFACE_PRODUCER_H_
 
 #include <memory>
 
@@ -19,4 +19,4 @@ class SnapshotSurfaceProducer {
 };
 
 }  // namespace flutter
-#endif  // SHELL_COMMON_SNAPSHOT_SURFACE_PRODUCER_H_
+#endif  // FLUTTER_SHELL_COMMON_SNAPSHOT_SURFACE_PRODUCER_H_
diff --git a/shell/common/switches.cc b/shell/common/switches.cc
@@ -17,7 +17,7 @@
 // Include once for the default enum definition.
 #include "flutter/shell/common/switches.h"
 
-#undef SHELL_COMMON_SWITCHES_H_
+#undef FLUTTER_SHELL_COMMON_SWITCHES_H_
 
 struct SwitchDesc {
   flutter::Switch sw;

diff --git a/shell/common/switches.h b/shell/common/switches.h
@@ -7,8 +7,8 @@
 #include "flutter/common/settings.h"
 #include "flutter/fml/command_line.h"
 
-#ifndef SHELL_COMMON_SWITCHES_H_
-#define SHELL_COMMON_SWITCHES_H_
+#ifndef FLUTTER_SHELL_COMMON_SWITCHES_H_
+#define FLUTTER_SHELL_COMMON_SWITCHES_H_
 
 namespace flutter {
 
@@ -304,4 +304,4 @@ Settings SettingsFromCommandLine(const fml::CommandLine& command_line);
 
 }  // namespace flutter
 
-#endif  // SHELL_COMMON_SWITCHES_H_
+#endif  // FLUTTER_SHELL_COMMON_SWITCHES_H_
diff --git a/shell/gpu/gpu_surface_gl_impeller.h b/shell/gpu/gpu_surface_gl_impeller.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 SHELL_GPU_GPU_SURFACE_GL_IMPELLER_H_
-#define SHELL_GPU_GPU_SURFACE_GL_IMPELLER_H_
+#ifndef FLUTTER_SHELL_GPU_GPU_SURFACE_GL_IMPELLER_H_
+#define FLUTTER_SHELL_GPU_GPU_SURFACE_GL_IMPELLER_H_
 
 #include "flutter/common/graphics/gl_context_switch.h"
 #include "flutter/flow/surface.h"
@@ -63,4 +63,4 @@ class GPUSurfaceGLImpeller final : public Surface {
 
 }  // namespace flutter
 
-#endif  // SHELL_GPU_GPU_SURFACE_GL_IMPELLER_H_
+#endif  // FLUTTER_SHELL_GPU_GPU_SURFACE_GL_IMPELLER_H_
diff --git a/shell/gpu/gpu_surface_gl_skia.h b/shell/gpu/gpu_surface_gl_skia.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 SHELL_GPU_GPU_SURFACE_GL_SKIA_H_
-#define SHELL_GPU_GPU_SURFACE_GL_SKIA_H_
+#ifndef FLUTTER_SHELL_GPU_GPU_SURFACE_GL_SKIA_H_
+#define FLUTTER_SHELL_GPU_GPU_SURFACE_GL_SKIA_H_
 
 #include <functional>
 #include <memory>
@@ -88,4 +88,4 @@ class GPUSurfaceGLSkia : public Surface {
 
 }  // namespace flutter
 
-#endif  // SHELL_GPU_GPU_SURFACE_GL_SKIA_H_
+#endif  // FLUTTER_SHELL_GPU_GPU_SURFACE_GL_SKIA_H_
diff --git a/shell/gpu/gpu_surface_metal_skia.h b/shell/gpu/gpu_surface_metal_skia.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 FLUTTER_SHELL_GPU_GPU_SURFACE_METAL_H_
-#define FLUTTER_SHELL_GPU_GPU_SURFACE_METAL_H_
+#ifndef FLUTTER_SHELL_GPU_GPU_SURFACE_METAL_SKIA_H_
+#define FLUTTER_SHELL_GPU_GPU_SURFACE_METAL_SKIA_H_
 
 #include "flutter/common/graphics/msaa_sample_count.h"
 #include "flutter/flow/surface.h"
@@ -71,4 +71,4 @@ class SK_API_AVAILABLE_CA_METAL_LAYER GPUSurfaceMetalSkia : public Surface {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_GPU_GPU_SURFACE_METAL_H_
+#endif  // FLUTTER_SHELL_GPU_GPU_SURFACE_METAL_SKIA_H_
diff --git a/shell/gpu/gpu_surface_vulkan.h b/shell/gpu/gpu_surface_vulkan.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 SHELL_GPU_GPU_SURFACE_VULKAN_H_
-#define SHELL_GPU_GPU_SURFACE_VULKAN_H_
+#ifndef FLUTTER_SHELL_GPU_GPU_SURFACE_VULKAN_H_
+#define FLUTTER_SHELL_GPU_GPU_SURFACE_VULKAN_H_
 
 #include <memory>
 
@@ -66,4 +66,4 @@ class GPUSurfaceVulkan : public Surface {
 
 }  // namespace flutter
 
-#endif  // SHELL_GPU_GPU_SURFACE_VULKAN_H_
+#endif  // FLUTTER_SHELL_GPU_GPU_SURFACE_VULKAN_H_
diff --git a/shell/gpu/gpu_surface_vulkan_impeller.h b/shell/gpu/gpu_surface_vulkan_impeller.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_SHELL_GPU_GPU_SURFACE_VULKAN_IMPELLER_H_
+#define FLUTTER_SHELL_GPU_GPU_SURFACE_VULKAN_IMPELLER_H_
 
 #include "flutter/common/graphics/gl_context_switch.h"
 #include "flutter/flow/surface.h"
@@ -52,3 +53,5 @@ class GPUSurfaceVulkanImpeller final : public Surface {
 };
 
 }  // namespace flutter
+
+#endif  // FLUTTER_SHELL_GPU_GPU_SURFACE_VULKAN_IMPELLER_H_
diff --git a/shell/platform/android/android_display.h b/shell/platform/android/android_display.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 FLUTTER_SHELL_PLATFORM_ANDROID_DISPLAY_H_
-#define FLUTTER_SHELL_PLATFORM_ANDROID_DISPLAY_H_
+#ifndef FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_DISPLAY_H_
+#define FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_DISPLAY_H_
 
 #include <cstdint>
 
@@ -39,4 +39,4 @@ class AndroidDisplay : public Display {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_DISPLAY_H_
+#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_DISPLAY_H_
diff --git a/shell/platform/android/android_surface_vulkan_impeller.h b/shell/platform/android/android_surface_vulkan_impeller.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_SURFACE_VULKAN_IMPELLER_H_
+#define FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_SURFACE_VULKAN_IMPELLER_H_
 
 #include "flutter/fml/concurrent_message_loop.h"
 #include "flutter/fml/macros.h"
@@ -54,3 +55,5 @@ class AndroidSurfaceVulkanImpeller : public AndroidSurface {
 };
 
 }  // namespace flutter
+
+#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_SURFACE_VULKAN_IMPELLER_H_
diff --git a/shell/platform/android/apk_asset_provider.h b/shell/platform/android/apk_asset_provider.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 FLUTTER_ASSETS_APK_ASSET_PROVIDER_H_
-#define FLUTTER_ASSETS_APK_ASSET_PROVIDER_H_
+#ifndef FLUTTER_SHELL_PLATFORM_ANDROID_APK_ASSET_PROVIDER_H_
+#define FLUTTER_SHELL_PLATFORM_ANDROID_APK_ASSET_PROVIDER_H_
 
 #include <android/asset_manager_jni.h>
 #include <jni.h>
@@ -64,4 +64,4 @@ class APKAssetProvider final : public AssetResolver {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_ASSETS_APK_ASSET_PROVIDER_H
+#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_APK_ASSET_PROVIDER_H_
diff --git a/shell/platform/android/context/android_context.h b/shell/platform/android/context/android_context.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 FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_CONTEXT_H_
-#define FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_CONTEXT_H_
+#ifndef FLUTTER_SHELL_PLATFORM_ANDROID_CONTEXT_ANDROID_CONTEXT_H_
+#define FLUTTER_SHELL_PLATFORM_ANDROID_CONTEXT_ANDROID_CONTEXT_H_
 
 #include "flutter/fml/macros.h"
 #include "flutter/fml/task_runner.h"
@@ -83,4 +83,4 @@ class AndroidContext {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_ANDROID_CONTEXT_H_
+#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_CONTEXT_ANDROID_CONTEXT_H_
diff --git a/shell/platform/android/external_view_embedder/external_view_embedder.h b/shell/platform/android/external_view_embedder/external_view_embedder.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 FLUTTER_SHELL_PLATFORM_ANDROID_EXTERNAL_VIEW_EMBEDDER_H_
-#define FLUTTER_SHELL_PLATFORM_ANDROID_EXTERNAL_VIEW_EMBEDDER_H_
+#ifndef FLUTTER_SHELL_PLATFORM_ANDROID_EXTERNAL_VIEW_EMBEDDER_EXTERNAL_VIEW_EMBEDDER_H_
+#define FLUTTER_SHELL_PLATFORM_ANDROID_EXTERNAL_VIEW_EMBEDDER_EXTERNAL_VIEW_EMBEDDER_H_
 
 #include <unordered_map>
 
@@ -149,4 +149,4 @@ class AndroidExternalViewEmbedder final : public ExternalViewEmbedder {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_EXTERNAL_VIEW_EMBEDDER_H_
+#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_EXTERNAL_VIEW_EMBEDDER_EXTERNAL_VIEW_EMBEDDER_H_
diff --git a/shell/platform/android/flutter_main.h b/shell/platform/android/flutter_main.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 SHELL_PLATFORM_ANDROID_FLUTTER_MAIN_H_
-#define SHELL_PLATFORM_ANDROID_FLUTTER_MAIN_H_
+#ifndef FLUTTER_SHELL_PLATFORM_ANDROID_FLUTTER_MAIN_H_
+#define FLUTTER_SHELL_PLATFORM_ANDROID_FLUTTER_MAIN_H_
 
 #include <jni.h>
 
@@ -45,4 +45,4 @@ class FlutterMain {
 
 }  // namespace flutter
 
-#endif  // SHELL_PLATFORM_ANDROID_FLUTTER_MAIN_H_
+#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_FLUTTER_MAIN_H_
diff --git a/shell/platform/android/jni/jni_mock.h b/shell/platform/android/jni/jni_mock.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 FLUTTER_SHELL_PLATFORM_ANDROID_JNI_MOCK_H_
-#define FLUTTER_SHELL_PLATFORM_ANDROID_JNI_MOCK_H_
+#ifndef FLUTTER_SHELL_PLATFORM_ANDROID_JNI_JNI_MOCK_H_
+#define FLUTTER_SHELL_PLATFORM_ANDROID_JNI_JNI_MOCK_H_
 
 #include "flutter/shell/platform/android/jni/platform_view_android_jni.h"
 #include "gmock/gmock.h"
@@ -132,4 +132,4 @@ class JNIMock final : public PlatformViewAndroidJNI {
 
 }  // namespace flutter
 
-#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_JNI_MOCK_H_
+#endif  // FLUTTER_SHELL_PLATFORM_ANDROID_JNI_JNI_MOCK_H_