Read the FLTEnableImpeller flag from the right bundle

Author: zanderso

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

@@ -207,7 +207,7 @@
   settings.enable_wide_gamut = enableWideGamut;
 
   // Whether to enable Impeller.
-  NSNumber* enableImpeller = [mainBundle objectForInfoDictionaryKey:@"FLTEnableImpeller"];
+  NSNumber* enableImpeller = [bundle objectForInfoDictionaryKey:@"FLTEnableImpeller"];
   // Change the default only if the option is present.
   if (enableImpeller != nil) {
     settings.enable_impeller = enableImpeller.boolValue;

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

@@ -73,15 +73,52 @@ - (void)testFLTFrameworkBundleInternalWhenBundleIsPresent {
   XCTAssertNotNil(found);
 }
 
+- (void)testDisableImpellerSettingIsCorrectlyParsed {
+  id mockMainBundle = OCMPartialMock([NSBundle mainBundle]);
+  OCMStub([mockMainBundle objectForInfoDictionaryKey:@"FLTEnableImpeller"]).andReturn(@"NO");
+
+  auto settings = FLTDefaultSettingsForBundle();
+  // Check settings.enable_impeller value is same as the value defined in Info.plist.
+  XCTAssertEqual(settings.enable_impeller, NO);
+}
+
 - (void)testEnableImpellerSettingIsCorrectlyParsed {
-  // The FLTEnableImpeller's value is defined in Info.plist
-  NSBundle* mainBundle = [NSBundle mainBundle];
-  NSNumber* enableImpeller = [mainBundle objectForInfoDictionaryKey:@"FLTEnableImpeller"];
-  XCTAssertEqual(enableImpeller.boolValue, NO);
+  id mockMainBundle = OCMPartialMock([NSBundle mainBundle]);
+  OCMStub([mockMainBundle objectForInfoDictionaryKey:@"FLTEnableImpeller"]).andReturn(@"YES");
+
+  auto settings = FLTDefaultSettingsForBundle();
+  // Check settings.enable_impeller value is same as the value defined in Info.plist.
+  XCTAssertEqual(settings.enable_impeller, YES);
+}
+
+- (void)testDisableImpellerAppBundleSettingIsCorrectlyParsed {
+  NSString* bundleId = [FlutterDartProject defaultBundleIdentifier];
+  id mockAppBundle = OCMClassMock([NSBundle class]);
+  OCMStub([mockAppBundle objectForInfoDictionaryKey:@"FLTEnableImpeller"]).andReturn(@"NO");
+
+  id nsBundleMock = OCMClassMock([NSBundle class]);
+  OCMStub([nsBundleMock bundleWithIdentifier:bundleId]).andReturn(mockAppBundle);
 
   auto settings = FLTDefaultSettingsForBundle();
   // Check settings.enable_impeller value is same as the value defined in Info.plist.
   XCTAssertEqual(settings.enable_impeller, NO);
+
+  [nsBundleMock stopMocking];
+}
+
+- (void)testEnableImpellerAppBundleSettingIsCorrectlyParsed {
+  NSString* bundleId = [FlutterDartProject defaultBundleIdentifier];
+  id mockAppBundle = OCMClassMock([NSBundle class]);
+  OCMStub([mockAppBundle objectForInfoDictionaryKey:@"FLTEnableImpeller"]).andReturn(@"YES");
+
+  id nsBundleMock = OCMClassMock([NSBundle class]);
+  OCMStub([nsBundleMock bundleWithIdentifier:bundleId]).andReturn(mockAppBundle);
+
+  auto settings = FLTDefaultSettingsForBundle();
+  // Check settings.enable_impeller value is same as the value defined in Info.plist.
+  XCTAssertEqual(settings.enable_impeller, YES);
+
+  [nsBundleMock stopMocking];
 }
 
 - (void)testEnableTraceSystraceSettingIsCorrectlyParsed {

testing/ios/IosUnitTests/App/Info.plist

@@ -46,8 +46,6 @@
 	</dict>
 	<key>FLTLeakDartVM</key>
 	<false/>
-	<key>FLTEnableImpeller</key>
-	<false/>
 	<key>FLTTraceSystrace</key>
 	<false/>
 	<key>FLTEnableDartProfiling</key>