[darwin] Header #import hygiene (#21193)

This patch applies the following changes:

* Rename a stray .cc file to .mm (connection_collection.cc).
* Migrate Objective-C #includes to #import as per the style guide.
* #include/#import order updated to reflect the style guide order:
  associated header, system/standard library headers, library headers,
  platform-specific includes.
* Include cstring where we're using strlen.
* Add a missing copyright header in SemanticsObjectTest.mm.

Bugs: https://github.com/flutter/flutter/issues/60025

ci/licenses_golden/licenses_flutter

@@ -969,8 +969,8 @@ FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/accessibility_
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge_test.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/accessibility_text_entry.h
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/accessibility_text_entry.mm
-FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/connection_collection.cc
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/connection_collection.h
+FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/connection_collection.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/connection_collection_test.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.h
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.mm

shell/platform/darwin/common/buffer_conversions.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/darwin/common/buffer_conversions.h"
+#import "flutter/shell/platform/darwin/common/buffer_conversions.h"
 
 namespace flutter {
 

shell/platform/darwin/common/command_line.h

@@ -6,6 +6,7 @@
 #define FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_COMMAND_LINE_H_
 
 #include "flutter/fml/command_line.h"
+
 #include "flutter/fml/macros.h"
 
 namespace flutter {

shell/platform/darwin/common/command_line.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/darwin/common/command_line.h"
+#import "flutter/shell/platform/darwin/common/command_line.h"
 
 #import <Foundation/Foundation.h>
 

shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h

@@ -7,7 +7,7 @@
 
 #import <Foundation/Foundation.h>
 
-#include "FlutterMacros.h"
+#import "FlutterMacros.h"
 
 NS_ASSUME_NONNULL_BEGIN
 /**

shell/platform/darwin/common/framework/Headers/FlutterChannels.h

@@ -5,8 +5,8 @@
 #ifndef FLUTTER_FLUTTERCHANNELS_H_
 #define FLUTTER_FLUTTERCHANNELS_H_
 
-#include "FlutterBinaryMessenger.h"
-#include "FlutterCodecs.h"
+#import "FlutterBinaryMessenger.h"
+#import "FlutterCodecs.h"
 
 NS_ASSUME_NONNULL_BEGIN
 /**

shell/platform/darwin/common/framework/Headers/FlutterCodecs.h

@@ -6,7 +6,8 @@
 #define FLUTTER_FLUTTERCODECS_H_
 
 #import <Foundation/Foundation.h>
-#include "FlutterMacros.h"
+
+#import "FlutterMacros.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

shell/platform/darwin/common/framework/Headers/FlutterTexture.h

@@ -8,7 +8,7 @@
 #import <CoreMedia/CoreMedia.h>
 #import <Foundation/Foundation.h>
 
-#include "FlutterMacros.h"
+#import "FlutterMacros.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

shell/platform/darwin/common/framework/Source/FlutterChannels.mm

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 // FLUTTER_NOLINT
 
-#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h"
+#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h"
 
 #pragma mark - Basic message channel
 

shell/platform/darwin/common/framework/Source/FlutterChannelsTest.m

@@ -6,9 +6,10 @@
 #error ARC must be enabled!
 #endif
 
+#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h"
+
 #import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
-#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h"
 
 @interface MockBinaryMessenger : NSObject <FlutterBinaryMessenger>
 @property(nonatomic, copy) NSString* channel;

shell/platform/darwin/common/framework/Source/FlutterCodecs.mm

@@ -3,7 +3,9 @@
 // found in the LICENSE file.
 // FLUTTER_NOLINT
 
-#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterCodecs.h"
+#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterCodecs.h"
+
+#include <cstring>
 
 @implementation FlutterBinaryCodec
 + (instancetype)sharedInstance {

shell/platform/darwin/common/framework/Source/FlutterStandardCodec.mm

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 // FLUTTER_NOLINT
 
-#include "FlutterStandardCodec_Internal.h"
+#import "flutter/shell/platform/darwin/common/framework/Source/FlutterStandardCodec_Internal.h"
 
 #pragma mark - Codec for basic message channel
 

shell/platform/darwin/common/framework/Source/FlutterStandardCodec_Internal.h

@@ -5,7 +5,7 @@
 #ifndef SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_SOURCE_FLUTTERSTANDARDCODECINTERNAL_H_
 #define SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_SOURCE_FLUTTERSTANDARDCODECINTERNAL_H_
 
-#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterCodecs.h"
+#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterCodecs.h"
 
 typedef NS_ENUM(NSInteger, FlutterStandardField) {
   FlutterStandardFieldNil,

shell/platform/darwin/common/framework/Source/flutter_codecs_unittest.mm

@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterCodecs.h"
+#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterCodecs.h"
+
 #include "gtest/gtest.h"
 
 TEST(FlutterStringCodec, CanEncodeAndDecodeNil) {

shell/platform/darwin/common/framework/Source/flutter_standard_codec_unittest.mm

@@ -3,7 +3,8 @@
 // found in the LICENSE file.
 // FLUTTER_NOLINT
 
-#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterCodecs.h"
+#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterCodecs.h"
+
 #include "gtest/gtest.h"
 
 void checkEncodeDecode(id value, NSData* expectedEncoding) {

shell/platform/darwin/ios/BUILD.gn

@@ -75,8 +75,8 @@ source_set("flutter_framework_source") {
     "framework/Source/accessibility_bridge.mm",
     "framework/Source/accessibility_text_entry.h",
     "framework/Source/accessibility_text_entry.mm",
-    "framework/Source/connection_collection.cc",
     "framework/Source/connection_collection.h",
+    "framework/Source/connection_collection.mm",
     "framework/Source/platform_message_response_darwin.h",
     "framework/Source/platform_message_response_darwin.mm",
     "framework/Source/platform_message_router.h",

shell/platform/darwin/ios/framework/Headers/Flutter.h

@@ -5,19 +5,19 @@
 #ifndef FLUTTER_FLUTTER_H_
 #define FLUTTER_FLUTTER_H_
 
-#include "FlutterAppDelegate.h"
-#include "FlutterBinaryMessenger.h"
-#include "FlutterCallbackCache.h"
-#include "FlutterChannels.h"
-#include "FlutterCodecs.h"
-#include "FlutterDartProject.h"
-#include "FlutterEngine.h"
-#include "FlutterHeadlessDartRunner.h"
-#include "FlutterMacros.h"
-#include "FlutterPlatformViews.h"
-#include "FlutterPlugin.h"
-#include "FlutterPluginAppLifeCycleDelegate.h"
-#include "FlutterTexture.h"
-#include "FlutterViewController.h"
+#import "FlutterAppDelegate.h"
+#import "FlutterBinaryMessenger.h"
+#import "FlutterCallbackCache.h"
+#import "FlutterChannels.h"
+#import "FlutterCodecs.h"
+#import "FlutterDartProject.h"
+#import "FlutterEngine.h"
+#import "FlutterHeadlessDartRunner.h"
+#import "FlutterMacros.h"
+#import "FlutterPlatformViews.h"
+#import "FlutterPlugin.h"
+#import "FlutterPluginAppLifeCycleDelegate.h"
+#import "FlutterTexture.h"
+#import "FlutterViewController.h"
 
 #endif  // FLUTTER_FLUTTER_H_

shell/platform/darwin/ios/framework/Headers/FlutterAppDelegate.h

@@ -7,8 +7,8 @@
 
 #import <UIKit/UIKit.h>
 
-#include "FlutterMacros.h"
-#include "FlutterPlugin.h"
+#import "FlutterMacros.h"
+#import "FlutterPlugin.h"
 
 /**
  * `UIApplicationDelegate` subclass for simple apps that want default behavior.

shell/platform/darwin/ios/framework/Headers/FlutterCallbackCache.h

@@ -7,7 +7,7 @@
 
 #import <Foundation/Foundation.h>
 
-#include "FlutterMacros.h"
+#import "FlutterMacros.h"
 
 /**
  * An object containing the result of `FlutterCallbackCache`'s `lookupCallbackInformation`

shell/platform/darwin/ios/framework/Headers/FlutterDartProject.h

@@ -7,7 +7,7 @@
 
 #import <Foundation/Foundation.h>
 
-#include "FlutterMacros.h"
+#import "FlutterMacros.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

shell/platform/darwin/ios/framework/Headers/FlutterEngine.h

@@ -8,11 +8,11 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
-#include "FlutterBinaryMessenger.h"
-#include "FlutterDartProject.h"
-#include "FlutterMacros.h"
-#include "FlutterPlugin.h"
-#include "FlutterTexture.h"
+#import "FlutterBinaryMessenger.h"
+#import "FlutterDartProject.h"
+#import "FlutterMacros.h"
+#import "FlutterPlugin.h"
+#import "FlutterTexture.h"
 
 @class FlutterViewController;
 

shell/platform/darwin/ios/framework/Headers/FlutterHeadlessDartRunner.h

@@ -7,10 +7,10 @@
 
 #import <Foundation/Foundation.h>
 
-#include "FlutterBinaryMessenger.h"
-#include "FlutterDartProject.h"
-#include "FlutterEngine.h"
-#include "FlutterMacros.h"
+#import "FlutterBinaryMessenger.h"
+#import "FlutterDartProject.h"
+#import "FlutterEngine.h"
+#import "FlutterMacros.h"
 
 /**
  * A callback for when FlutterHeadlessDartRunner has attempted to start a Dart

shell/platform/darwin/ios/framework/Headers/FlutterPlugin.h

@@ -8,11 +8,11 @@
 #import <UIKit/UIKit.h>
 #import <UserNotifications/UNUserNotificationCenter.h>
 
-#include "FlutterBinaryMessenger.h"
-#include "FlutterChannels.h"
-#include "FlutterCodecs.h"
-#include "FlutterPlatformViews.h"
-#include "FlutterTexture.h"
+#import "FlutterBinaryMessenger.h"
+#import "FlutterChannels.h"
+#import "FlutterCodecs.h"
+#import "FlutterPlatformViews.h"
+#import "FlutterTexture.h"
 
 NS_ASSUME_NONNULL_BEGIN
 @protocol FlutterPluginRegistrar;

shell/platform/darwin/ios/framework/Headers/FlutterPluginAppLifeCycleDelegate.h

@@ -5,7 +5,7 @@
 #ifndef FLUTTER_FLUTTERPLUGINAPPLIFECYCLEDELEGATE_H_
 #define FLUTTER_FLUTTERPLUGINAPPLIFECYCLEDELEGATE_H_
 
-#include "FlutterPlugin.h"
+#import "FlutterPlugin.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

shell/platform/darwin/ios/framework/Headers/FlutterViewController.h

@@ -8,12 +8,12 @@
 #import <UIKit/UIKit.h>
 #include <sys/cdefs.h>
 
-#include "FlutterBinaryMessenger.h"
-#include "FlutterDartProject.h"
-#include "FlutterEngine.h"
-#include "FlutterMacros.h"
-#include "FlutterPlugin.h"
-#include "FlutterTexture.h"
+#import "FlutterBinaryMessenger.h"
+#import "FlutterDartProject.h"
+#import "FlutterEngine.h"
+#import "FlutterMacros.h"
+#import "FlutterPlugin.h"
+#import "FlutterTexture.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

shell/platform/darwin/ios/framework/Source/FlutterAppDelegate.mm

@@ -2,11 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterAppDelegate.h"
+#import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterAppDelegate.h"
+
 #include "flutter/fml/logging.h"
-#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterPluginAppLifeCycleDelegate.h"
-#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h"
-#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterPluginAppLifeCycleDelegate_internal.h"
+#import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterPluginAppLifeCycleDelegate.h"
+#import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterPluginAppLifeCycleDelegate_internal.h"
 
 static NSString* kUIBackgroundMode = @"UIBackgroundModes";
 static NSString* kRemoteNotificationCapabitiliy = @"remote-notification";

shell/platform/darwin/ios/framework/Source/FlutterBinaryMessengerRelayTest.mm

@@ -2,10 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterBinaryMessengerRelay.h"
+
 #import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
-#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
-#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterBinaryMessengerRelay.h"
+
+#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
 
 FLUTTER_ASSERT_ARC
 

shell/platform/darwin/ios/framework/Source/FlutterCallbackCache_Internal.h

@@ -5,7 +5,7 @@
 #ifndef FLUTTER_FLUTTERCALLBACKCACHE_INTERNAL_H_
 #define FLUTTER_FLUTTERCALLBACKCACHE_INTERNAL_H_
 
-#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterCallbackCache.h"
+#import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterCallbackCache.h"
 
 @interface FlutterCallbackCache ()
 

shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm

@@ -4,7 +4,7 @@
 
 #define FML_USED_ON_EMBEDDER
 
-#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterDartProject_Internal.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterDartProject_Internal.h"
 
 #include "flutter/common/task_runners.h"
 #include "flutter/fml/mapping.h"
@@ -13,8 +13,8 @@
 #include "flutter/runtime/dart_vm.h"
 #include "flutter/shell/common/shell.h"
 #include "flutter/shell/common/switches.h"
-#include "flutter/shell/platform/darwin/common/command_line.h"
-#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h"
+#import "flutter/shell/platform/darwin/common/command_line.h"
+#import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h"
 
 extern "C" {
 #if FLUTTER_RUNTIME_MODE == FLUTTER_RUNTIME_MODE_DEBUG

shell/platform/darwin/ios/framework/Source/FlutterDartProjectTest.mm

@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #import <XCTest/XCTest.h>
+
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterDartProject_Internal.h"
 
 FLUTTER_ASSERT_ARC

shell/platform/darwin/ios/framework/Source/FlutterDartProject_Internal.h

@@ -8,7 +8,7 @@
 #include "flutter/common/settings.h"
 #include "flutter/runtime/platform_data.h"
 #include "flutter/shell/common/engine.h"
-#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterDartProject.h"
+#import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterDartProject.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

shell/platform/darwin/ios/framework/Source/FlutterEngine.mm

@@ -17,10 +17,7 @@
 #include "flutter/shell/common/shell.h"
 #include "flutter/shell/common/switches.h"
 #include "flutter/shell/common/thread_host.h"
-#include "flutter/shell/platform/darwin/common/command_line.h"
-#include "flutter/shell/platform/darwin/ios/rendering_api_selection.h"
-#include "flutter/shell/profiling/sampling_profiler.h"
-
+#import "flutter/shell/platform/darwin/common/command_line.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterBinaryMessengerRelay.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterDartProject_Internal.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterObservatoryPublisher.h"
@@ -32,6 +29,8 @@
 #import "flutter/shell/platform/darwin/ios/framework/Source/profiler_metrics_ios.h"
 #import "flutter/shell/platform/darwin/ios/ios_surface.h"
 #import "flutter/shell/platform/darwin/ios/platform_view_ios.h"
+#import "flutter/shell/platform/darwin/ios/rendering_api_selection.h"
+#include "flutter/shell/profiling/sampling_profiler.h"
 
 NSString* const FlutterDefaultDartEntrypoint = nil;
 NSString* const FlutterDefaultInitialRoute = nil;

shell/platform/darwin/ios/framework/Source/FlutterEnginePlatformViewTest.mm

@@ -7,7 +7,7 @@
 #import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
 
-#import "flutter/fml/message_loop.h"
+#include "flutter/fml/message_loop.h"
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterEngine_Internal.h"
 #import "flutter/shell/platform/darwin/ios/platform_view_ios.h"

shell/platform/darwin/ios/framework/Source/FlutterEngineTest.mm

@@ -4,7 +4,8 @@
 
 #import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
-#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
+
+#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterBinaryMessengerRelay.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterEngine_Test.h"
 

shell/platform/darwin/ios/framework/Source/FlutterEngine_Internal.h

@@ -7,8 +7,6 @@
 
 #import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterEngine.h"
 
-#import "FlutterPlatformViews_Internal.h"
-
 #include "flutter/fml/memory/weak_ptr.h"
 #include "flutter/fml/task_runner.h"
 #include "flutter/lib/ui/window/pointer_data_packet.h"
@@ -16,13 +14,13 @@
 #include "flutter/shell/common/platform_view.h"
 #include "flutter/shell/common/rasterizer.h"
 #include "flutter/shell/common/shell.h"
-#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterDartProject_Internal.h"
-#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.h"
-#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputDelegate.h"
-#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.h"
-#include "flutter/shell/platform/darwin/ios/platform_view_ios.h"
-
-#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterEngine.h"
+#import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterEngine.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterDartProject_Internal.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputDelegate.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.h"
+#import "flutter/shell/platform/darwin/ios/platform_view_ios.h"
 
 @interface FlutterEngine () <FlutterViewEngineDelegate>
 

shell/platform/darwin/ios/framework/Source/FlutterHeadlessDartRunner.mm

@@ -4,8 +4,6 @@
 
 #define FML_USED_ON_EMBEDDER
 
-#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterEngine_Internal.h"
-
 #import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterHeadlessDartRunner.h"
 
 #include <memory>
@@ -18,11 +16,12 @@
 #include "flutter/shell/common/shell.h"
 #include "flutter/shell/common/switches.h"
 #include "flutter/shell/common/thread_host.h"
-#include "flutter/shell/platform/darwin/common/command_line.h"
-#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterPlugin.h"
-#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterDartProject_Internal.h"
-#include "flutter/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.h"
-#include "flutter/shell/platform/darwin/ios/platform_view_ios.h"
+#import "flutter/shell/platform/darwin/common/command_line.h"
+#import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterPlugin.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterDartProject_Internal.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterEngine_Internal.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.h"
+#import "flutter/shell/platform/darwin/ios/platform_view_ios.h"
 
 @implementation FlutterHeadlessDartRunner {
 }

shell/platform/darwin/ios/framework/Source/FlutterOverlayView.h

@@ -9,13 +9,13 @@
 
 #include <memory>
 
-#import "FlutterPlatformViews_Internal.h"
-
 #include "flutter/fml/memory/weak_ptr.h"
 #include "flutter/shell/common/shell.h"
-#include "flutter/shell/platform/darwin/ios/ios_context_gl.h"
-#include "flutter/shell/platform/darwin/ios/ios_surface.h"
-#include "flutter/shell/platform/darwin/ios/ios_surface_gl.h"
+#import "flutter/shell/platform/darwin/ios/ios_context_gl.h"
+#import "flutter/shell/platform/darwin/ios/ios_surface.h"
+#import "flutter/shell/platform/darwin/ios/ios_surface_gl.h"
+
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h"
 
 /// UIViews that are used by |FlutterPlatformViews| to present Flutter
 /// rendering on top of system compositor rendering (ex. a web view).

shell/platform/darwin/ios/framework/Source/FlutterOverlayView.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterOverlayView.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterOverlayView.h"
 
 #include "flutter/common/settings.h"
 #include "flutter/common/task_runners.h"
@@ -12,9 +12,9 @@
 #include "flutter/fml/trace_event.h"
 #include "flutter/shell/common/platform_view.h"
 #include "flutter/shell/common/rasterizer.h"
-#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterView.h"
-#include "flutter/shell/platform/darwin/ios/ios_surface_gl.h"
-#include "flutter/shell/platform/darwin/ios/ios_surface_software.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterView.h"
+#import "flutter/shell/platform/darwin/ios/ios_surface_gl.h"
+#import "flutter/shell/platform/darwin/ios/ios_surface_software.h"
 #include "third_party/skia/include/utils/mac/SkCGUtils.h"
 
 // This is mostly a duplication of FlutterView.

shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.h

@@ -6,8 +6,8 @@
 #define SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERPLATFORMPLUGIN_H_
 
 #include "flutter/fml/memory/weak_ptr.h"
-#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h"
-#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterEngine.h"
+#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h"
+#import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterEngine.h"
 
 @interface FlutterPlatformPlugin : NSObject
 - (instancetype)init NS_UNAVAILABLE;

shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.mm

@@ -2,14 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.h"
-#include "flutter/fml/logging.h"
-#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterViewController_Internal.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.h"
+
+#import <AudioToolbox/AudioToolbox.h>
+#import <Foundation/Foundation.h>
+#import <UIKit/UIApplication.h>
+#import <UIKit/UIKit.h>
 
-#include <AudioToolbox/AudioToolbox.h>
-#include <Foundation/Foundation.h>
-#include <UIKit/UIApplication.h>
-#include <UIKit/UIKit.h>
+#include "flutter/fml/logging.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterViewController_Internal.h"
 
 namespace {
 

shell/platform/darwin/ios/framework/Source/FlutterPlatformPluginTest.mm

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
 
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h"
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.h"
 #import "flutter/shell/platform/darwin/ios/platform_view_ios.h"
-#import "third_party/ocmock/Source/OCMock/OCMock.h"
 
 @interface FlutterPlatformPluginTest : XCTestCase
 @end

shell/platform/darwin/ios/framework/Source/FlutterPlatformViews.mm

@@ -4,20 +4,19 @@
 
 #import <UIKit/UIGestureRecognizerSubclass.h>
 
-#import "FlutterOverlayView.h"
-#import "flutter/shell/platform/darwin/ios/ios_surface.h"
-#import "flutter/shell/platform/darwin/ios/ios_surface_gl.h"
-
 #include <list>
 #include <map>
 #include <memory>
 #include <string>
 
-#include "FlutterPlatformViews_Internal.h"
 #include "flutter/flow/rtree.h"
 #include "flutter/fml/platform/darwin/scoped_nsobject.h"
 #include "flutter/shell/common/persistent_cache.h"
-#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h"
+#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterOverlayView.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h"
+#import "flutter/shell/platform/darwin/ios/ios_surface.h"
+#import "flutter/shell/platform/darwin/ios/ios_surface_gl.h"
 
 namespace flutter {
 

shell/platform/darwin/ios/framework/Source/FlutterPlatformViewsTest.mm

@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
 
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h"
@@ -11,7 +12,6 @@
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterViewController_Internal.h"
 #import "flutter/shell/platform/darwin/ios/platform_view_ios.h"
-#import "third_party/ocmock/Source/OCMock/OCMock.h"
 
 FLUTTER_ASSERT_NOT_ARC
 @class FlutterPlatformViewsTestMockPlatformView;

shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h

@@ -9,11 +9,11 @@
 #include "flutter/flow/rtree.h"
 #include "flutter/fml/platform/darwin/scoped_nsobject.h"
 #include "flutter/shell/common/shell.h"
-#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h"
-#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h"
-#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterPlatformViews.h"
-#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterPlugin.h"
-#include "flutter/shell/platform/darwin/ios/ios_context.h"
+#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h"
+#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h"
+#import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterPlatformViews.h"
+#import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterPlugin.h"
+#import "flutter/shell/platform/darwin/ios/ios_context.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
 
 @class FlutterTouchInterceptingView;

shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.mm

@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h"
 
 #include "flutter/fml/platform/darwin/cf_utils.h"
-#include "flutter/shell/platform/darwin/ios/ios_surface.h"
+#import "flutter/shell/platform/darwin/ios/ios_surface.h"
 
 static int kMaxPointsInVerb = 4;
 

shell/platform/darwin/ios/framework/Source/FlutterPluginAppLifeCycleDelegate.mm

@@ -2,12 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterPluginAppLifeCycleDelegate.h"
+#import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterPluginAppLifeCycleDelegate.h"
+
 #include "flutter/fml/logging.h"
 #include "flutter/fml/paths.h"
 #include "flutter/lib/ui/plugins/callback_cache.h"
-#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h"
-#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterCallbackCache_Internal.h"
+#import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterCallbackCache_Internal.h"
 
 static const char* kCallbackCacheSubDir = "Library/Caches/";
 

shell/platform/darwin/ios/framework/Source/FlutterPluginAppLifeCycleDelegateTest.m

@@ -2,10 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
-#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
+
+#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
 #import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterPluginAppLifeCycleDelegate.h"
-#import "third_party/ocmock/Source/OCMock/OCMock.h"
 
 FLUTTER_ASSERT_ARC
 

shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.h

@@ -7,8 +7,8 @@
 
 #import <UIKit/UIKit.h>
 
-#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h"
-#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputDelegate.h"
+#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputDelegate.h"
 
 @interface FlutterTextInputPlugin : NSObject
 

shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.mm

@@ -2,11 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.h"
-#include "flutter/fml/platform/darwin/string_range_sanitization.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.h"
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 
-#include <Foundation/Foundation.h>
-#include <UIKit/UIKit.h>
+#include "flutter/fml/platform/darwin/string_range_sanitization.h"
 
 static const char _kTextAffinityDownstream[] = "TextAffinity.downstream";
 static const char _kTextAffinityUpstream[] = "TextAffinity.upstream";

shell/platform/darwin/ios/framework/Source/FlutterTextInputPluginTest.m

@@ -2,11 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.h"
+
+#import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
-#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
+
+#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
 #import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterEngine.h"
-#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.h"
-#import "third_party/ocmock/Source/OCMock/OCMock.h"
 
 FLUTTER_ASSERT_ARC
 

shell/platform/darwin/ios/framework/Source/FlutterView.h

@@ -5,16 +5,15 @@
 #ifndef SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTER_VIEW_H_
 #define SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTER_VIEW_H_
 
-#include <UIKit/UIKit.h>
+#import <UIKit/UIKit.h>
 
 #include <memory>
 
-#import "FlutterPlatformViews_Internal.h"
-
 #include "flutter/fml/memory/weak_ptr.h"
 #include "flutter/shell/common/shell.h"
-#include "flutter/shell/platform/darwin/ios/ios_context.h"
-#include "flutter/shell/platform/darwin/ios/ios_surface.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h"
+#import "flutter/shell/platform/darwin/ios/ios_context.h"
+#import "flutter/shell/platform/darwin/ios/ios_surface.h"
 
 @protocol FlutterViewEngineDelegate <NSObject>
 

shell/platform/darwin/ios/framework/Source/FlutterView.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterView.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterView.h"
 
 #include "flutter/common/settings.h"
 #include "flutter/common/task_runners.h"
@@ -12,9 +12,9 @@
 #include "flutter/fml/trace_event.h"
 #include "flutter/shell/common/platform_view.h"
 #include "flutter/shell/common/rasterizer.h"
-#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterViewController_Internal.h"
-#include "flutter/shell/platform/darwin/ios/ios_surface_gl.h"
-#include "flutter/shell/platform/darwin/ios/ios_surface_software.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterViewController_Internal.h"
+#import "flutter/shell/platform/darwin/ios/ios_surface_gl.h"
+#import "flutter/shell/platform/darwin/ios/ios_surface_software.h"
 #include "third_party/skia/include/utils/mac/SkCGUtils.h"
 
 @implementation FlutterView {

shell/platform/darwin/ios/framework/Source/FlutterViewControllerTest.mm

@@ -4,12 +4,12 @@
 
 #import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
+
+#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h"
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
 #import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterViewController_Internal.h"
 
-#include "FlutterBinaryMessenger.h"
-
 FLUTTER_ASSERT_ARC
 
 @interface FlutterEngine ()

shell/platform/darwin/ios/framework/Source/FlutterViewController_Internal.h

@@ -6,7 +6,8 @@
 #define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERVIEWCONTROLLER_INTERNAL_H_
 
 #include "flutter/fml/memory/weak_ptr.h"
-#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h"
+
+#import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h"
 
 namespace flutter {
 class FlutterPlatformViewsController;

shell/platform/darwin/ios/framework/Source/IOKit.h

@@ -14,9 +14,9 @@
 #ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_IOKIT_H_
 #define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_IOKIT_H_
 
-#if __cplusplus
+#if defined(__cplusplus)
 extern "C" {
-#endif  // __cplusplus
+#endif  // defined(__cplusplus)
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <mach/mach.h>

shell/platform/darwin/ios/framework/Source/SemanticsObject.h

@@ -10,7 +10,7 @@
 #include "flutter/fml/macros.h"
 #include "flutter/fml/memory/weak_ptr.h"
 #include "flutter/lib/ui/semantics/semantics_node.h"
-#include "flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge_ios.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge_ios.h"
 
 constexpr int32_t kRootNodeId = 0;
 

shell/platform/darwin/ios/framework/Source/SemanticsObject.mm

@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/darwin/ios/framework/Source/SemanticsObject.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/SemanticsObject.h"
 
 #include "flutter/fml/platform/darwin/scoped_nsobject.h"
-#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h"
 
 namespace {
 

shell/platform/darwin/ios/framework/Source/SemanticsObjectTest.mm

+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
 
-#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
+#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/SemanticsObject.h"
-#import "third_party/ocmock/Source/OCMock/OCMock.h"
 
 FLUTTER_ASSERT_ARC
 

shell/platform/darwin/ios/framework/Source/accessibility_bridge.h

@@ -5,24 +5,24 @@
 #ifndef SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_ACCESSIBILITY_BRIDGE_H_
 #define SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_ACCESSIBILITY_BRIDGE_H_
 
+#import <UIKit/UIKit.h>
+
 #include <memory>
 #include <unordered_map>
 #include <unordered_set>
 #include <vector>
 
-#import <UIKit/UIKit.h>
-
 #include "flutter/fml/macros.h"
 #include "flutter/fml/memory/weak_ptr.h"
 #include "flutter/fml/platform/darwin/scoped_nsobject.h"
 #include "flutter/lib/ui/semantics/custom_accessibility_action.h"
 #include "flutter/lib/ui/semantics/semantics_node.h"
-#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h"
-#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h"
-#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.h"
-#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterView.h"
-#include "flutter/shell/platform/darwin/ios/framework/Source/SemanticsObject.h"
-#include "flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge_ios.h"
+#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h"
+#import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterView.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/SemanticsObject.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge_ios.h"
 #include "third_party/skia/include/core/SkRect.h"
 
 namespace flutter {

shell/platform/darwin/ios/framework/Source/accessibility_bridge.mm

@@ -3,10 +3,10 @@
 // found in the LICENSE file.
 
 #import "flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge.h"
+
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterEngine_Internal.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterViewController_Internal.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/accessibility_text_entry.h"
-
 #import "flutter/shell/platform/darwin/ios/platform_view_ios.h"
 
 #pragma GCC diagnostic error "-Wundeclared-selector"

shell/platform/darwin/ios/framework/Source/accessibility_bridge_test.mm

@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
 
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h"
@@ -10,7 +11,6 @@
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge.h"
 #import "flutter/shell/platform/darwin/ios/platform_view_ios.h"
-#import "third_party/ocmock/Source/OCMock/OCMock.h"
 
 FLUTTER_ASSERT_NOT_ARC
 @class MockPlatformView;

shell/platform/darwin/ios/framework/Source/accessibility_text_entry.mm

@@ -4,8 +4,8 @@
 
 #import <UIKit/UIKit.h>
 
-#include "flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge.h"
-#include "flutter/shell/platform/darwin/ios/framework/Source/accessibility_text_entry.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/accessibility_text_entry.h"
 
 static const UIAccessibilityTraits UIAccessibilityTraitUndocumentedEmptyLine = 0x800000000000;
 

shell/platform/darwin/ios/framework/Source/connection_collection.cc → shell/platform/darwin/ios/framework/Source/connection_collection.mm

@@ -2,18 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/darwin/ios/framework/Source/connection_collection.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/connection_collection.h"
 
 namespace flutter {
-ConnectionCollection::Connection ConnectionCollection::AquireConnection(
-    const std::string& name) {
+ConnectionCollection::Connection ConnectionCollection::AquireConnection(const std::string& name) {
   Connection nextConnection = ++counter_;
   connections_[name] = nextConnection;
   return nextConnection;
 }
 
-std::string ConnectionCollection::CleanupConnection(
-    ConnectionCollection::Connection connection) {
+std::string ConnectionCollection::CleanupConnection(ConnectionCollection::Connection connection) {
   if (connection > 0) {
     std::string channel;
     for (auto& keyValue : connections_) {
@@ -30,13 +28,11 @@ std::string ConnectionCollection::CleanupConnection(
   return "";
 }
 
-bool ConnectionCollection::IsValidConnection(
-    ConnectionCollection::Connection connection) {
+bool ConnectionCollection::IsValidConnection(ConnectionCollection::Connection connection) {
   return connection > 0;
 }
 
-ConnectionCollection::Connection ConnectionCollection::MakeErrorConnection(
-    int errCode) {
+ConnectionCollection::Connection ConnectionCollection::MakeErrorConnection(int errCode) {
   if (errCode < 0) {
     return -1 * errCode;
   }

shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.h

@@ -12,7 +12,7 @@
 #include "flutter/fml/platform/darwin/scoped_block.h"
 #include "flutter/fml/task_runner.h"
 #include "flutter/lib/ui/window/platform_message_response.h"
-#include "flutter/shell/platform/darwin/common/buffer_conversions.h"
+#import "flutter/shell/platform/darwin/common/buffer_conversions.h"
 
 typedef void (^PlatformMessageResponseCallback)(NSData*);
 

shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.h"
 
 namespace flutter {
 

shell/platform/darwin/ios/framework/Source/platform_message_router.h

@@ -10,7 +10,7 @@
 #include "flutter/fml/memory/weak_ptr.h"
 #include "flutter/fml/platform/darwin/scoped_block.h"
 #include "flutter/lib/ui/window/platform_message.h"
-#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h"
+#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h"
 
 namespace flutter {
 

shell/platform/darwin/ios/framework/Source/platform_message_router.mm

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/darwin/ios/framework/Source/platform_message_router.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/platform_message_router.h"
 
 #include <vector>
 
-#include "flutter/shell/platform/darwin/common/buffer_conversions.h"
+#import "flutter/shell/platform/darwin/common/buffer_conversions.h"
 
 namespace flutter {
 

shell/platform/darwin/ios/framework/Source/profiler_metrics_ios.mm

@@ -2,9 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/darwin/ios/framework/Source/profiler_metrics_ios.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/profiler_metrics_ios.h"
+
 #import <Foundation/Foundation.h>
-#import "IOKit.h"
+
+#import "flutter/shell/platform/darwin/ios/framework/Source/IOKit.h"
 
 namespace {
 

shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.h"
 
 #include <utility>
 

shell/platform/darwin/ios/ios_context.h

@@ -11,8 +11,8 @@
 #include "flutter/flow/texture.h"
 #include "flutter/fml/macros.h"
 #include "flutter/fml/platform/darwin/scoped_nsobject.h"
-#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterTexture.h"
-#include "flutter/shell/platform/darwin/ios/rendering_api_selection.h"
+#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterTexture.h"
+#import "flutter/shell/platform/darwin/ios/rendering_api_selection.h"
 #include "third_party/skia/include/gpu/GrDirectContext.h"
 
 namespace flutter {

shell/platform/darwin/ios/ios_context.mm

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/darwin/ios/ios_context.h"
+#import "flutter/shell/platform/darwin/ios/ios_context.h"
 
 #include "flutter/fml/logging.h"
-#include "flutter/shell/platform/darwin/ios/ios_context_gl.h"
-#include "flutter/shell/platform/darwin/ios/ios_context_software.h"
+#import "flutter/shell/platform/darwin/ios/ios_context_gl.h"
+#import "flutter/shell/platform/darwin/ios/ios_context_software.h"
 
 #if FLUTTER_SHELL_ENABLE_METAL
-#include "flutter/shell/platform/darwin/ios/ios_context_metal.h"
+#import "flutter/shell/platform/darwin/ios/ios_context_metal.h"
 #endif  // FLUTTER_SHELL_ENABLE_METAL
 
 namespace flutter {

shell/platform/darwin/ios/ios_context_gl.h

@@ -8,9 +8,9 @@
 #include "flutter/fml/macros.h"
 #include "flutter/fml/platform/darwin/scoped_nsobject.h"
 #include "flutter/shell/common/platform_view.h"
-#include "flutter/shell/platform/darwin/ios/ios_context.h"
-#include "flutter/shell/platform/darwin/ios/ios_context_gl.h"
-#include "flutter/shell/platform/darwin/ios/ios_render_target_gl.h"
+#import "flutter/shell/platform/darwin/ios/ios_context.h"
+#import "flutter/shell/platform/darwin/ios/ios_context_gl.h"
+#import "flutter/shell/platform/darwin/ios/ios_render_target_gl.h"
 
 @class CAEAGLLayer;
 

shell/platform/darwin/ios/ios_context_gl.mm

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/darwin/ios/ios_context_gl.h"
+#import "flutter/shell/platform/darwin/ios/ios_context_gl.h"
 
 #import <OpenGLES/EAGL.h>
 
 #include "flutter/shell/common/shell_io_manager.h"
 #include "flutter/shell/gpu/gpu_surface_gl_delegate.h"
-#include "flutter/shell/platform/darwin/ios/ios_external_texture_gl.h"
+#import "flutter/shell/platform/darwin/ios/ios_external_texture_gl.h"
 
 namespace flutter {
 

shell/platform/darwin/ios/ios_context_metal.h

@@ -10,7 +10,7 @@
 #include "flutter/fml/macros.h"
 #include "flutter/fml/platform/darwin/cf_utils.h"
 #include "flutter/fml/platform/darwin/scoped_nsobject.h"
-#include "flutter/shell/platform/darwin/ios/ios_context.h"
+#import "flutter/shell/platform/darwin/ios/ios_context.h"
 #include "third_party/skia/include/gpu/GrDirectContext.h"
 
 namespace flutter {

shell/platform/darwin/ios/ios_context_metal.mm

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/darwin/ios/ios_context_metal.h"
+#import "flutter/shell/platform/darwin/ios/ios_context_metal.h"
 
 #include "flutter/fml/logging.h"
 #include "flutter/shell/common/persistent_cache.h"
-#include "flutter/shell/platform/darwin/ios/ios_external_texture_metal.h"
+#import "flutter/shell/platform/darwin/ios/ios_external_texture_metal.h"
 #include "third_party/skia/include/gpu/GrContextOptions.h"
 
 namespace flutter {

shell/platform/darwin/ios/ios_context_software.h

@@ -6,7 +6,7 @@
 #define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_IOS_CONTEXT_SOFTWARE_H_
 
 #include "flutter/fml/macros.h"
-#include "flutter/shell/platform/darwin/ios/ios_context.h"
+#import "flutter/shell/platform/darwin/ios/ios_context.h"
 
 namespace flutter {
 

shell/platform/darwin/ios/ios_context_software.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/darwin/ios/ios_context_software.h"
+#import "flutter/shell/platform/darwin/ios/ios_context_software.h"
 
 namespace flutter {
 

shell/platform/darwin/ios/ios_external_texture_gl.h

@@ -8,7 +8,7 @@
 #include "flutter/flow/texture.h"
 #include "flutter/fml/platform/darwin/cf_utils.h"
 #include "flutter/fml/platform/darwin/scoped_nsobject.h"
-#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterTexture.h"
+#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterTexture.h"
 
 namespace flutter {
 

shell/platform/darwin/ios/ios_external_texture_gl.mm

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/darwin/ios/ios_external_texture_gl.h"
+#import "flutter/shell/platform/darwin/ios/ios_external_texture_gl.h"
 
 #import <OpenGLES/EAGL.h>
 #import <OpenGLES/ES2/gl.h>
 #import <OpenGLES/ES2/glext.h>
 
-#include "flutter/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "third_party/skia/include/core/SkYUVAIndex.h"
 #include "third_party/skia/include/gpu/GrBackendSurface.h"

shell/platform/darwin/ios/ios_external_texture_metal.h

@@ -13,7 +13,7 @@
 #include "flutter/fml/macros.h"
 #include "flutter/fml/platform/darwin/cf_utils.h"
 #include "flutter/fml/platform/darwin/scoped_nsobject.h"
-#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterTexture.h"
+#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterTexture.h"
 #include "third_party/skia/include/core/SkImage.h"
 
 namespace flutter {

shell/platform/darwin/ios/ios_external_texture_metal.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/darwin/ios/ios_external_texture_metal.h"
+#import "flutter/shell/platform/darwin/ios/ios_external_texture_metal.h"
 
 #include "flutter/fml/logging.h"
 #include "third_party/skia/include/core/SkYUVAIndex.h"

shell/platform/darwin/ios/ios_render_target_gl.h

@@ -13,7 +13,7 @@
 #include "flutter/fml/macros.h"
 #include "flutter/fml/platform/darwin/scoped_nsobject.h"
 #include "flutter/shell/common/platform_view.h"
-#include "flutter/shell/platform/darwin/ios/ios_switchable_gl_context.h"
+#import "flutter/shell/platform/darwin/ios/ios_switchable_gl_context.h"
 
 namespace flutter {
 

shell/platform/darwin/ios/ios_render_target_gl.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/darwin/ios/ios_render_target_gl.h"
+#import "flutter/shell/platform/darwin/ios/ios_render_target_gl.h"
 
 #include <UIKit/UIKit.h>
 

shell/platform/darwin/ios/ios_surface.mm

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/darwin/ios/ios_surface.h"
+#import "flutter/shell/platform/darwin/ios/ios_surface.h"
 
-#include "flutter/shell/platform/darwin/ios/ios_surface_gl.h"
-#include "flutter/shell/platform/darwin/ios/ios_surface_software.h"
+#import "flutter/shell/platform/darwin/ios/ios_surface_gl.h"
+#import "flutter/shell/platform/darwin/ios/ios_surface_software.h"
 
 #if FLUTTER_SHELL_ENABLE_METAL
-#include "flutter/shell/platform/darwin/ios/ios_surface_metal.h"
+#import "flutter/shell/platform/darwin/ios/ios_surface_metal.h"
 #endif  // FLUTTER_SHELL_ENABLE_METAL
 
 namespace flutter {

shell/platform/darwin/ios/ios_surface_gl.h

@@ -8,9 +8,9 @@
 #include "flutter/fml/macros.h"
 #include "flutter/fml/platform/darwin/scoped_nsobject.h"
 #include "flutter/shell/gpu/gpu_surface_gl.h"
-#include "flutter/shell/platform/darwin/ios/ios_context.h"
-#include "flutter/shell/platform/darwin/ios/ios_render_target_gl.h"
-#include "flutter/shell/platform/darwin/ios/ios_surface.h"
+#import "flutter/shell/platform/darwin/ios/ios_context.h"
+#import "flutter/shell/platform/darwin/ios/ios_render_target_gl.h"
+#import "flutter/shell/platform/darwin/ios/ios_surface.h"
 
 @class CAEAGLLayer;
 

shell/platform/darwin/ios/ios_surface_gl.mm

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/darwin/ios/ios_surface_gl.h"
+#import "flutter/shell/platform/darwin/ios/ios_surface_gl.h"
 
 #include "flutter/fml/trace_event.h"
 #include "flutter/shell/gpu/gpu_surface_gl.h"
-#include "flutter/shell/platform/darwin/ios/ios_context_gl.h"
+#import "flutter/shell/platform/darwin/ios/ios_context_gl.h"
 
 namespace flutter {
 

shell/platform/darwin/ios/ios_surface_metal.h

@@ -7,7 +7,7 @@
 
 #include "flutter/fml/macros.h"
 #include "flutter/shell/gpu/gpu_surface_delegate.h"
-#include "flutter/shell/platform/darwin/ios/ios_surface.h"
+#import "flutter/shell/platform/darwin/ios/ios_surface.h"
 
 @class CAMetalLayer;
 

shell/platform/darwin/ios/ios_surface_metal.mm

@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/darwin/ios/ios_surface_metal.h"
+#import "flutter/shell/platform/darwin/ios/ios_surface_metal.h"
 
 #include "flutter/shell/gpu/gpu_surface_metal.h"
-#include "flutter/shell/platform/darwin/ios/ios_context_metal.h"
+#import "flutter/shell/platform/darwin/ios/ios_context_metal.h"
 
 namespace flutter {
 

shell/platform/darwin/ios/ios_surface_software.h

@@ -9,8 +9,8 @@
 #include "flutter/fml/macros.h"
 #include "flutter/fml/platform/darwin/scoped_nsobject.h"
 #include "flutter/shell/gpu/gpu_surface_software.h"
-#include "flutter/shell/platform/darwin/ios/ios_context.h"
-#include "flutter/shell/platform/darwin/ios/ios_surface.h"
+#import "flutter/shell/platform/darwin/ios/ios_context.h"
+#import "flutter/shell/platform/darwin/ios/ios_surface.h"
 
 @class CALayer;
 

shell/platform/darwin/ios/ios_surface_software.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/darwin/ios/ios_surface_software.h"
+#import "flutter/shell/platform/darwin/ios/ios_surface_software.h"
 
 #include <QuartzCore/CALayer.h>
 

shell/platform/darwin/ios/ios_switchable_gl_context.mm

@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/darwin/ios/ios_switchable_gl_context.h"
+#import "flutter/shell/platform/darwin/ios/ios_switchable_gl_context.h"
+
 #import <OpenGLES/EAGL.h>
 
 namespace flutter {

shell/platform/darwin/ios/platform_view_ios.h

@@ -12,14 +12,14 @@
 #include "flutter/fml/memory/weak_ptr.h"
 #include "flutter/fml/platform/darwin/scoped_nsobject.h"
 #include "flutter/shell/common/platform_view.h"
-#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterTexture.h"
-#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h"
-#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterView.h"
-#include "flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge.h"
-#include "flutter/shell/platform/darwin/ios/framework/Source/platform_message_router.h"
-#include "flutter/shell/platform/darwin/ios/ios_context.h"
-#include "flutter/shell/platform/darwin/ios/ios_surface.h"
-#include "flutter/shell/platform/darwin/ios/rendering_api_selection.h"
+#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterTexture.h"
+#import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterView.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/platform_message_router.h"
+#import "flutter/shell/platform/darwin/ios/ios_context.h"
+#import "flutter/shell/platform/darwin/ios/ios_surface.h"
+#import "flutter/shell/platform/darwin/ios/rendering_api_selection.h"
 
 @class FlutterViewController;
 

shell/platform/darwin/ios/platform_view_ios.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/darwin/ios/platform_view_ios.h"
+#import "flutter/shell/platform/darwin/ios/platform_view_ios.h"
 
 #include <utility>
 

shell/platform/darwin/ios/rendering_api_selection.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/shell/platform/darwin/ios/rendering_api_selection.h"
+#import "flutter/shell/platform/darwin/ios/rendering_api_selection.h"
 
 #include <Foundation/Foundation.h>
 #include <QuartzCore/CAEAGLLayer.h>

shell/platform/darwin/macos/framework/Headers/FlutterAppDelegate.h

@@ -7,7 +7,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#include "FlutterMacros.h"
+#import "FlutterMacros.h"
 
 /**
  * `NSApplicationDelegate` subclass for simple apps that want default behavior.

shell/platform/darwin/macos/framework/Headers/FlutterDartProject.h

@@ -7,7 +7,7 @@
 
 #import <Foundation/Foundation.h>
 
-#include "FlutterMacros.h"
+#import "FlutterMacros.h"
 
 /**
  * A set of Flutter and Dart assets used by a `FlutterEngine` to initialize execution.

shell/platform/darwin/macos/framework/Headers/FlutterEngine.h

@@ -7,11 +7,11 @@
 
 #import <Foundation/Foundation.h>
 
-#include "FlutterBinaryMessenger.h"
-#include "FlutterDartProject.h"
-#include "FlutterMacros.h"
-#include "FlutterPluginRegistrarMacOS.h"
-#include "FlutterTexture.h"
+#import "FlutterBinaryMessenger.h"
+#import "FlutterDartProject.h"
+#import "FlutterMacros.h"
+#import "FlutterPluginRegistrarMacOS.h"
+#import "FlutterTexture.h"
 
 // TODO: Merge this file with the iOS FlutterEngine.h.
 

shell/platform/darwin/macos/framework/Headers/FlutterPluginRegistrarMacOS.h

@@ -4,11 +4,10 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "FlutterPluginMacOS.h"
-
 #import "FlutterBinaryMessenger.h"
 #import "FlutterChannels.h"
 #import "FlutterMacros.h"
+#import "FlutterPluginMacOS.h"
 #import "FlutterTexture.h"
 
 // TODO: Merge this file and FlutterPluginMacOS.h with the iOS FlutterPlugin.h, sharing all but

shell/platform/darwin/macos/framework/Source/FlutterEngineUnittests.mm

@@ -3,9 +3,9 @@
 // found in the LICENSE file.
 // FLUTTER_NOLINT
 
-#include "flutter/shell/platform/darwin/macos/framework/Headers/FlutterEngine.h"
-#include "flutter/shell/platform/darwin/macos/framework/Source/FlutterDartProject_Internal.h"
-#include "flutter/shell/platform/darwin/macos/framework/Source/FlutterEngine_Internal.h"
+#import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterEngine.h"
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterDartProject_Internal.h"
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterEngine_Internal.h"
 #include "flutter/testing/testing.h"
 
 namespace flutter::testing {

shell/platform/darwin/macos/framework/Source/FlutterViewControllerTest.mm

@@ -4,11 +4,12 @@
 
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterViewController_Internal.h"
 
-#include "flutter/shell/platform/darwin/macos/framework/Headers/FlutterEngine.h"
-#include "flutter/shell/platform/darwin/macos/framework/Source/FlutterDartProject_Internal.h"
-#include "flutter/shell/platform/darwin/macos/framework/Source/FlutterEngine_Internal.h"
+#import <OCMock/OCMock.h>
+
+#import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterEngine.h"
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterDartProject_Internal.h"
+#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterEngine_Internal.h"
 #include "flutter/testing/testing.h"
-#import "third_party/ocmock/Source/OCMock/OCMock.h"
 
 namespace flutter::testing {