diff options
Diffstat (limited to 'chromium/ios/third_party')
| -rw-r--r-- | chromium/ios/third_party/earl_grey/BUILD.gn | 4 | ||||
| -rw-r--r-- | chromium/ios/third_party/earl_grey2/BUILD.gn | 93 | ||||
| -rw-r--r-- | chromium/ios/third_party/earl_grey2/ios_eg2_test.gni | 11 | ||||
| -rw-r--r-- | chromium/ios/third_party/material_components_ios/BUILD.gn | 10 |
4 files changed, 90 insertions, 28 deletions
diff --git a/chromium/ios/third_party/earl_grey/BUILD.gn b/chromium/ios/third_party/earl_grey/BUILD.gn index 5b1c3ec5574..710332d1ad4 100644 --- a/chromium/ios/third_party/earl_grey/BUILD.gn +++ b/chromium/ios/third_party/earl_grey/BUILD.gn @@ -295,6 +295,10 @@ ios_framework_bundle("earl_grey") { "//ios/third_party/ochamcrest:ochamcrest+link", ] + # EG1 is no longer maintained and will be dropped once the migration to EG2 + # is complete. + cflags_objc = [ "-Wno-deprecated-declarations" ] + libs = [ "CoreData.framework", "CoreGraphics.framework", diff --git a/chromium/ios/third_party/earl_grey2/BUILD.gn b/chromium/ios/third_party/earl_grey2/BUILD.gn index a3c935e3c45..2e3dfd2d3ac 100644 --- a/chromium/ios/third_party/earl_grey2/BUILD.gn +++ b/chromium/ios/third_party/earl_grey2/BUILD.gn @@ -8,7 +8,41 @@ import("//build/config/ios/rules.gni") config("config") { include_dirs = [ "//ios/third_party/earl_grey2/src", + "//ios/third_party/earl_grey2/src/AppFramework/Action", + "//ios/third_party/earl_grey2/src/AppFramework/Assertion", + "//ios/third_party/earl_grey2/src/AppFramework/Config", + "//ios/third_party/earl_grey2/src/AppFramework/Core", + "//ios/third_party/earl_grey2/src/AppFramework/DistantObject", + "//ios/third_party/earl_grey2/src/AppFramework/Error", + "//ios/third_party/earl_grey2/src/AppFramework/Event", + "//ios/third_party/earl_grey2/src/AppFramework/Keyboard", + "//ios/third_party/earl_grey2/src/AppFramework/Matcher", + "//ios/third_party/earl_grey2/src/AppFramework/Synchronization", + "//ios/third_party/earl_grey2/src/CommonLib", + "//ios/third_party/earl_grey2/src/CommonLib/Additions", + "//ios/third_party/earl_grey2/src/CommonLib/Assertion", + "//ios/third_party/earl_grey2/src/CommonLib/Config", + "//ios/third_party/earl_grey2/src/CommonLib/DistantObject", + "//ios/third_party/earl_grey2/src/CommonLib/Error", + "//ios/third_party/earl_grey2/src/CommonLib/Event", + "//ios/third_party/earl_grey2/src/CommonLib/Exceptions", + "//ios/third_party/earl_grey2/src/CommonLib/Matcher", + "//ios/third_party/earl_grey2/src/CommonLib/Provider", + "//ios/third_party/earl_grey2/src/UILib", + "//ios/third_party/earl_grey2/src/UILib/Additions", + "//ios/third_party/earl_grey2/src/UILib/Provider", + "//ios/third_party/earl_grey2/src/UILib/Traversal", + "//ios/third_party/earl_grey2/src/TestLib", + "//ios/third_party/earl_grey2/src/TestLib/AlertHandling", + "//ios/third_party/earl_grey2/src/TestLib/AppleInternals", + "//ios/third_party/earl_grey2/src/TestLib/Assertion", + "//ios/third_party/earl_grey2/src/TestLib/Condition", + "//ios/third_party/earl_grey2/src/TestLib/Config", + "//ios/third_party/earl_grey2/src/TestLib/Exception", + "//ios/third_party/earl_grey2/src/TestLib/DistantObject", + "//ios/third_party/earl_grey2/src/TestLib/XCTestCase", "//ios/third_party/edo/src", + "//ios/third_party/edo/src/Service/Sources", ] } @@ -37,15 +71,24 @@ source_set("common_lib") { "src/CommonLib/Additions/UIView+GREYCommon.h", "src/CommonLib/Additions/UIView+GREYCommon.m", "src/CommonLib/Assertion/GREYAssertion.h", + "src/CommonLib/Assertion/GREYAssertionBlock+Private.h", "src/CommonLib/Assertion/GREYAssertionBlock.h", "src/CommonLib/Assertion/GREYAssertionBlock.m", + "src/CommonLib/Assertion/GREYAssertionDefinesPrivate.h", + "src/CommonLib/Assertion/GREYFatalAsserts.h", + "src/CommonLib/Assertion/GREYThrowDefines.h", "src/CommonLib/Config/GREYAppState.h", "src/CommonLib/Config/GREYConfigKey.h", "src/CommonLib/Config/GREYConfigKey.m", "src/CommonLib/Config/GREYConfiguration+Private.h", "src/CommonLib/Config/GREYConfiguration.h", "src/CommonLib/Config/GREYConfiguration.m", + "src/CommonLib/DistantObject/GREYHostApplicationDistantObject.h", + "src/CommonLib/DistantObject/GREYHostBackgroundDistantObject.h", + "src/CommonLib/DistantObject/GREYTestApplicationDistantObject+Private.h", + "src/CommonLib/DistantObject/GREYTestApplicationDistantObject.h", "src/CommonLib/DistantObject/GREYValueType.m", + "src/CommonLib/Error/GREYError+Private.h", "src/CommonLib/Error/GREYError.h", "src/CommonLib/Error/GREYError.m", "src/CommonLib/Error/GREYErrorConstants.h", @@ -62,8 +105,12 @@ source_set("common_lib") { "src/CommonLib/Exceptions/GREYFailureHandler.h", "src/CommonLib/Exceptions/GREYFrameworkException.h", "src/CommonLib/Exceptions/GREYFrameworkException.m", + "src/CommonLib/GREYAppleInternals.h", "src/CommonLib/GREYConstants.h", "src/CommonLib/GREYConstants.m", + "src/CommonLib/GREYDefines.h", + "src/CommonLib/GREYDiagnosable.h", + "src/CommonLib/GREYLogger.h", "src/CommonLib/GREYObjcRuntime.h", "src/CommonLib/GREYObjcRuntime.m", "src/CommonLib/GREYStopwatch.h", @@ -73,12 +120,15 @@ source_set("common_lib") { "src/CommonLib/Matcher/GREYBaseMatcher.h", "src/CommonLib/Matcher/GREYBaseMatcher.m", "src/CommonLib/Matcher/GREYDescription.h", + "src/CommonLib/Matcher/GREYElementMatcherBlock+Private.h", "src/CommonLib/Matcher/GREYElementMatcherBlock.h", "src/CommonLib/Matcher/GREYElementMatcherBlock.m", "src/CommonLib/Matcher/GREYLayoutConstraint.h", "src/CommonLib/Matcher/GREYLayoutConstraint.m", + "src/CommonLib/Matcher/GREYMatcher.h", "src/CommonLib/Matcher/GREYStringDescription.h", "src/CommonLib/Matcher/GREYStringDescription.m", + "src/CommonLib/Provider/GREYProvider.h", ] deps = [ @@ -122,9 +172,9 @@ source_set("ui_lib") { "src/UILib/Additions/NSObject+GREYUI.h", "src/UILib/Additions/NSObject+GREYUI.m", "src/UILib/GREYElementHierarchy.m", - "src/UILib/GREYScreenshotter+Internal.h", + "src/UILib/GREYScreenshotter+Private.h", "src/UILib/GREYScreenshotter.m", - "src/UILib/GREYVisibilityChecker+Internal.h", + "src/UILib/GREYVisibilityChecker+Private.h", "src/UILib/GREYVisibilityChecker.m", "src/UILib/Provider/GREYDataEnumerator.h", "src/UILib/Provider/GREYDataEnumerator.m", @@ -132,12 +182,14 @@ source_set("ui_lib") { "src/UILib/Provider/GREYElementProvider.m", "src/UILib/Provider/GREYUIWindowProvider.h", "src/UILib/Provider/GREYUIWindowProvider.m", - "src/UILib/Traversal/GREYTraversal.h", - "src/UILib/Traversal/GREYTraversal.m", "src/UILib/Traversal/GREYTraversalBFS.h", "src/UILib/Traversal/GREYTraversalBFS.m", "src/UILib/Traversal/GREYTraversalDFS.h", "src/UILib/Traversal/GREYTraversalDFS.m", + "src/UILib/Traversal/GREYTraversalFunctions.h", + "src/UILib/Traversal/GREYTraversalFunctions.m", + "src/UILib/Traversal/GREYTraversalObject.h", + "src/UILib/Traversal/GREYTraversalObject.m", ] deps = [ @@ -175,6 +227,7 @@ source_set("app_framework_shared_headers") { "src/AppFramework/Action/GREYActionsShorthand.h", "src/AppFramework/Config/GREYAppConfiguration.h", "src/AppFramework/Core/GREYElementInteraction.h", + "src/AppFramework/Core/GREYInteraction.h", "src/AppFramework/DistantObject/GREYHostApplicationDistantObject+GREYTestHelper.h", "src/AppFramework/DistantObject/GREYHostBackgroundDistantObject+GREYApp.h", "src/AppFramework/Error/GREYFailureScreenshotter.h", @@ -184,7 +237,6 @@ source_set("app_framework_shared_headers") { "src/AppFramework/Matcher/GREYAnyOf.h", "src/AppFramework/Matcher/GREYMatchers.h", "src/AppFramework/Matcher/GREYMatchersShorthand.h", - "src/AppFramework/Matcher/GREYNot.h", "src/AppFramework/Synchronization/GREYUIThreadExecutor.h", ] } @@ -196,12 +248,11 @@ ios_framework_bundle("app_framework") { info_plist = "Info.plist" sources = [ - "src/AppFramework/Action/GREYAction.h", + "src/AppFramework/Action/GREYActionBlock+Private.h", "src/AppFramework/Action/GREYActionBlock.h", "src/AppFramework/Action/GREYActionBlock.m", - "src/AppFramework/Action/GREYActions+Internal.h", + "src/AppFramework/Action/GREYActions+Private.h", "src/AppFramework/Action/GREYActions.m", - "src/AppFramework/Action/GREYActionsShorthand.h", "src/AppFramework/Action/GREYActionsShorthand.m", "src/AppFramework/Action/GREYBaseAction.h", "src/AppFramework/Action/GREYBaseAction.m", @@ -231,8 +282,6 @@ ios_framework_bundle("app_framework") { "src/AppFramework/Additions/CAAnimation+GREYApp.m", "src/AppFramework/Additions/CALayer+GREYApp.h", "src/AppFramework/Additions/CALayer+GREYApp.m", - "src/AppFramework/Additions/NSException+GREYApp.h", - "src/AppFramework/Additions/NSException+GREYApp.m", "src/AppFramework/Additions/NSObject+GREYApp.h", "src/AppFramework/Additions/NSObject+GREYApp.m", "src/AppFramework/Additions/NSRunLoop+GREYApp.h", @@ -272,9 +321,8 @@ ios_framework_bundle("app_framework") { "src/AppFramework/Config/GREYAppConfiguration.m", "src/AppFramework/Core/GREYElementFinder.h", "src/AppFramework/Core/GREYElementFinder.m", - "src/AppFramework/Core/GREYElementInteraction+Internal.h", + "src/AppFramework/Core/GREYElementInteraction+Private.h", "src/AppFramework/Core/GREYElementInteraction.m", - "src/AppFramework/Core/GREYInteraction.h", "src/AppFramework/Core/GREYInteractionDataSource.h", "src/AppFramework/Delegate/GREYCAAnimationDelegate.h", "src/AppFramework/Delegate/GREYCAAnimationDelegate.m", @@ -290,8 +338,6 @@ ios_framework_bundle("app_framework") { "src/AppFramework/DistantObject/GREYHostBackgroundDistantObject.m", "src/AppFramework/DistantObject/GREYTestStub.m", "src/AppFramework/Error/GREYAppError.h", - "src/AppFramework/Error/GREYAppFailureHandler.h", - "src/AppFramework/Error/GREYAppFailureHandler.m", "src/AppFramework/Error/GREYFailureScreenshotter.m", "src/AppFramework/Event/GREYIOHIDEventTypes.h", "src/AppFramework/Event/GREYSyntheticEvents.m", @@ -311,11 +357,11 @@ ios_framework_bundle("app_framework") { "src/AppFramework/IdlingResources/GREYUIWebViewIdlingResource.h", "src/AppFramework/IdlingResources/GREYUIWebViewIdlingResource.m", "src/AppFramework/Keyboard/GREYKeyboard.m", + "src/AppFramework/Matcher/GREYAllOf+Private.h", "src/AppFramework/Matcher/GREYAllOf.m", "src/AppFramework/Matcher/GREYAnyOf.m", "src/AppFramework/Matcher/GREYMatchers.m", "src/AppFramework/Matcher/GREYMatchersShorthand.m", - "src/AppFramework/Matcher/GREYNot.m", "src/AppFramework/Synchronization/GREYAppStateTracker.h", "src/AppFramework/Synchronization/GREYAppStateTracker.m", "src/AppFramework/Synchronization/GREYAppStateTrackerObject.h", @@ -328,7 +374,7 @@ ios_framework_bundle("app_framework") { "src/AppFramework/Synchronization/GREYRunLoopSpinner.m", "src/AppFramework/Synchronization/GREYSyncAPI.h", "src/AppFramework/Synchronization/GREYSyncAPI.m", - "src/AppFramework/Synchronization/GREYUIThreadExecutor+Internal.h", + "src/AppFramework/Synchronization/GREYUIThreadExecutor+Private.h", "src/AppFramework/Synchronization/GREYUIThreadExecutor.m", ] @@ -383,17 +429,17 @@ source_set("test_lib") { sources = [ "src/AppFramework/Action/GREYActionsShorthand.m", - "src/AppFramework/Error/GREYFailureScreenshotterStub.m", "src/AppFramework/Matcher/GREYMatchersShorthand.m", "src/TestLib/AlertHandling/XCTestCase+GREYSystemAlertHandler.h", "src/TestLib/AlertHandling/XCTestCase+GREYSystemAlertHandler.m", - "src/TestLib/Analytics/GREYAnalytics.h", - "src/TestLib/Analytics/GREYAnalytics.m", - "src/TestLib/Analytics/GREYAnalyticsDelegate.h", + "src/TestLib/AppleInternals/GREYXCTestAppleInternals.h", + "src/TestLib/Assertion/GREYAssertionDefines.h", "src/TestLib/Condition/GREYCondition.h", "src/TestLib/Condition/GREYCondition.m", + "src/TestLib/Config/GREYTestConfiguration.h", "src/TestLib/Config/GREYTestConfiguration.m", "src/TestLib/DistantObject/GREYHostStub.m", + "src/TestLib/DistantObject/GREYTestApplicationDistantObject+GREYLogger.h", "src/TestLib/DistantObject/GREYTestApplicationDistantObject+GREYLogger.m", "src/TestLib/DistantObject/GREYTestApplicationDistantObject.m", "src/TestLib/EarlGreyImpl/EarlGrey.h", @@ -404,6 +450,8 @@ source_set("test_lib") { "src/TestLib/EarlGreyImpl/GREYElementInteractionErrorHandler.m", "src/TestLib/EarlGreyImpl/GREYElementInteractionProxy.h", "src/TestLib/EarlGreyImpl/GREYElementInteractionProxy.m", + "src/TestLib/EarlGreyImpl/GREYRemoteExecutor.h", + "src/TestLib/EarlGreyImpl/GREYRemoteExecutor.m", "src/TestLib/EarlGreyImpl/XCUIApplication+GREYTest.h", "src/TestLib/EarlGreyImpl/XCUIApplication+GREYTest.m", "src/TestLib/Exception/GREYDefaultFailureHandler.h", @@ -418,20 +466,17 @@ source_set("test_lib") { "src/TestLib/XCTestCase/XCTestCase+GREYTest.m", "src/TestLib/XCTestCase/XCUIApplication+GREYEnvironment.h", "src/TestLib/XCTestCase/XCUIApplication+GREYEnvironment.m", - "src/UILib/GREYElementHierarchyStub.m", - "src/UILib/GREYScreenshotterStub.m", - "src/UILib/GREYVisibilityCheckerStub.m", ] deps = [ ":app_framework_shared_headers", - ":common_lib", ":ui_lib_shared_headers", "//build/config/ios:xctest", "//ios/third_party/edo", ] public_deps = [ + ":common_lib", ":test_lib_shared_headers", ] diff --git a/chromium/ios/third_party/earl_grey2/ios_eg2_test.gni b/chromium/ios/third_party/earl_grey2/ios_eg2_test.gni index 1723aaa7f63..676e290d7e7 100644 --- a/chromium/ios/third_party/earl_grey2/ios_eg2_test.gni +++ b/chromium/ios/third_party/earl_grey2/ios_eg2_test.gni @@ -31,11 +31,14 @@ template("ios_eg2_test_app_host") { deps += [ "//ios/third_party/firebase" ] } - # Xcode needs those two framework installed in the application (and signed) - # for the XCTest to run, so install them using extra_system_frameworks. + # Xcode needs the following frameworks installed in the application (and + # signed) for the XCTest to run, so install them using + # extra_system_frameworks. _ios_platform_library = "$ios_sdk_platform_path/Developer/Library" - extra_system_frameworks = - [ "$_ios_platform_library/Frameworks/XCTest.framework" ] + extra_system_frameworks = [ + "$_ios_platform_library/Frameworks/XCTest.framework", + "$ios_sdk_platform_path/Developer/Library/PrivateFrameworks/XCTAutomationSupport.framework", + ] if (!defined(ldflags)) { ldflags = [] diff --git a/chromium/ios/third_party/material_components_ios/BUILD.gn b/chromium/ios/third_party/material_components_ios/BUILD.gn index 477a419948c..aeb56abc236 100644 --- a/chromium/ios/third_party/material_components_ios/BUILD.gn +++ b/chromium/ios/third_party/material_components_ios/BUILD.gn @@ -15,7 +15,10 @@ copy("mdc_components_ios_public_headers") { "src/components/Buttons/src/ShapeThemer/MaterialButtons+ShapeThemer.h", "src/components/Buttons/src/TypographyThemer/MaterialButtons+TypographyThemer.h", "src/components/Cards/src/MaterialCards.h", + "src/components/Dialogs/src/ColorThemer/MaterialDialogs+ColorThemer.h", + "src/components/Dialogs/src/MDCAlertController+ButtonForAction.h", "src/components/Dialogs/src/MaterialDialogs.h", + "src/components/Dialogs/src/TypographyThemer/MaterialDialogs+TypographyThemer.h", "src/components/ShadowElevations/src/MaterialShadowElevations.h", "src/components/Typography/src/MaterialTypography.h", "src/components/schemes/Color/src/MaterialColorScheme.h", @@ -61,6 +64,7 @@ config("config") { "src/components/Typography/src", "src/components/Shapes/src/", "src/components/private/UIMetrics/src", + "src/components/private/Color/src", "src/components/schemes/Color/src", "src/components/schemes/Container/src/", "src/components/schemes/Shape/src", @@ -221,6 +225,8 @@ source_set("material_components_ios") { "src/components/Dialogs/src/DialogThemer/MDCAlertControllerThemer.m", "src/components/Dialogs/src/DialogThemer/MDCAlertScheme.h", "src/components/Dialogs/src/DialogThemer/MDCAlertScheme.m", + "src/components/Dialogs/src/MDCAlertController+ButtonForAction.h", + "src/components/Dialogs/src/MDCAlertController+ButtonForAction.m", "src/components/Dialogs/src/MDCAlertController.h", "src/components/Dialogs/src/MDCAlertController.m", "src/components/Dialogs/src/MDCAlertControllerView.h", @@ -229,6 +235,8 @@ source_set("material_components_ios") { "src/components/Dialogs/src/MDCDialogTransitionController.h", "src/components/Dialogs/src/MDCDialogTransitionController.m", "src/components/Dialogs/src/MaterialDialogs.h", + "src/components/Dialogs/src/Theming/MDCAlertController+MaterialTheming.h", + "src/components/Dialogs/src/Theming/MDCAlertController+MaterialTheming.m", "src/components/Dialogs/src/TypographyThemer/MDCAlertTypographyThemer.h", "src/components/Dialogs/src/TypographyThemer/MDCAlertTypographyThemer.m", "src/components/Dialogs/src/UIViewController+MaterialDialogs.h", @@ -363,6 +371,8 @@ source_set("material_components_ios") { "src/components/private/Application/src/MaterialApplication.h", "src/components/private/Application/src/UIApplication+AppExtensions.h", "src/components/private/Application/src/UIApplication+AppExtensions.m", + "src/components/private/Color/src/UIColor+MaterialDynamic.h", + "src/components/private/Color/src/UIColor+MaterialDynamic.m", "src/components/private/Icons/icons/ic_arrow_back/src/MaterialIcons+ic_arrow_back.h", "src/components/private/Icons/icons/ic_arrow_back/src/MaterialIcons+ic_arrow_back.m", "src/components/private/Icons/icons/ic_check/src/MaterialIcons+ic_check.h", |