Roll EG2 to e3c928c5abc94848e96b52b50e5468b275769ef3

Change-Id: I97cd43a160e26046d1710df1b430e6bb3fd93b8b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1626582Reviewed-by: Rohit Rao <rohitrao@chromium.org>
Commit-Queue: Lindsay Pasricha <lindsayw@chromium.org>
Cr-Commit-Position: refs/heads/master@{#663155}

DEPS

@@ -441,7 +441,7 @@ deps = {
   },
 
   'src/ios/third_party/earl_grey2/src': {
-      'url': Var('chromium_git') + '/external/github.com/google/EarlGrey.git' + '@' + 'ad70b511da47793e27e77c1a69c7895e8403be45',
+      'url': Var('chromium_git') + '/external/github.com/google/EarlGrey.git' + '@' + 'e3c928c5abc94848e96b52b50e5468b275769ef3',
       'condition': 'checkout_ios',
   },
 

ios/chrome/test/earl_grey/chrome_actions_app_interface.mm

@@ -42,7 +42,7 @@ NSString* kChromeActionsErrorDomain = @"ChromeActionsError";
           // EG2 executes actions on a background thread by default. Since this
           // action interacts with UI, kick it over to the main thread.
           __block BOOL success = NO;
-          grey_execute_sync_on_main_thread(^{
+          grey_dispatch_sync_on_main_thread(^{
             SettingsSwitchCell* switchCell =
                 base::mac::ObjCCast<SettingsSwitchCell>(collectionViewCell);
             if (!switchCell) {
@@ -79,7 +79,7 @@ NSString* kChromeActionsErrorDomain = @"ChromeActionsError";
           // EG2 executes actions on a background thread by default. Since this
           // action interacts with UI, kick it over to the main thread.
           __block BOOL success = NO;
-          grey_execute_sync_on_main_thread(^{
+          grey_dispatch_sync_on_main_thread(^{
             SettingsSwitchCell* switchCell =
                 base::mac::ObjCCastStrict<SettingsSwitchCell>(syncSwitchCell);
             UISwitch* switchView = switchCell.switchView;

ios/testing/earl_grey/earl_grey_app.h

@@ -20,7 +20,7 @@ typedef MatchesBlock GREYMatchesBlock;
 // Provides a no-op implementation of an EG2 API that doesn't exist in EG1. This
 // helper assumes that it is already being called on the main thread and
 // synchronously runs the given |block|.
-void grey_execute_sync_on_main_thread(void (^block)(void));
+void grey_dispatch_sync_on_main_thread(void (^block)(void));
 
 #elif defined(CHROME_EARL_GREY_2)
 

ios/testing/earl_grey/earl_grey_app.mm

@@ -9,7 +9,7 @@
 #endif
 
 #if defined(CHROME_EARL_GREY_1)
-void grey_execute_sync_on_main_thread(void (^block)(void)) {
+void grey_dispatch_sync_on_main_thread(void (^block)(void)) {
   block();
 }
 #endif

ios/third_party/earl_grey2/BUILD.gn

@@ -28,6 +28,8 @@ source_set("common_lib") {
   visibility = [ ":*" ]
 
   sources = [
+    "src/CommonLib/Additions/NSFileManager+GREYCommon.h",
+    "src/CommonLib/Additions/NSFileManager+GREYCommon.m",
     "src/CommonLib/Additions/NSObject+GREYCommon.h",
     "src/CommonLib/Additions/NSObject+GREYCommon.m",
     "src/CommonLib/Additions/NSString+GREYCommon.h",
@@ -104,7 +106,7 @@ source_set("ui_lib_shared_headers") {
 
   sources = [
     "src/UILib/GREYElementHierarchy.h",
-    "src/UILib/GREYScreenshotUtil.h",
+    "src/UILib/GREYScreenshotter.h",
     "src/UILib/GREYVisibilityChecker.h",
   ]
 }
@@ -120,7 +122,8 @@ source_set("ui_lib") {
     "src/UILib/Additions/NSObject+GREYUI.h",
     "src/UILib/Additions/NSObject+GREYUI.m",
     "src/UILib/GREYElementHierarchy.m",
-    "src/UILib/GREYScreenshotUtil.m",
+    "src/UILib/GREYScreenshotter+Internal.h",
+    "src/UILib/GREYScreenshotter.m",
     "src/UILib/GREYVisibilityChecker+Internal.h",
     "src/UILib/GREYVisibilityChecker.m",
     "src/UILib/Provider/GREYDataEnumerator.h",
@@ -286,6 +289,7 @@ ios_framework_bundle("app_framework") {
     "src/AppFramework/DistantObject/GREYHostBackgroundDistantObject+GREYApp.m",
     "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",
@@ -396,6 +400,8 @@ source_set("test_lib") {
     "src/TestLib/EarlGreyImpl/EarlGrey.m",
     "src/TestLib/EarlGreyImpl/EarlGreyImpl+XCUIApplication.h",
     "src/TestLib/EarlGreyImpl/EarlGreyImpl+XCUIApplication.m",
+    "src/TestLib/EarlGreyImpl/GREYElementInteractionErrorHandler.h",
+    "src/TestLib/EarlGreyImpl/GREYElementInteractionErrorHandler.m",
     "src/TestLib/EarlGreyImpl/GREYElementInteractionProxy.h",
     "src/TestLib/EarlGreyImpl/GREYElementInteractionProxy.m",
     "src/TestLib/EarlGreyImpl/XCUIApplication+GREYTest.h",
@@ -404,6 +410,8 @@ source_set("test_lib") {
     "src/TestLib/Exception/GREYDefaultFailureHandler.m",
     "src/TestLib/Exception/GREYFailureFormatter.h",
     "src/TestLib/Exception/GREYFailureFormatter.m",
+    "src/TestLib/Exception/GREYFailureScreenshotSaver.h",
+    "src/TestLib/Exception/GREYFailureScreenshotSaver.m",
     "src/TestLib/XCTestCase/GREYTestCaseInvocation.h",
     "src/TestLib/XCTestCase/GREYTestCaseInvocation.m",
     "src/TestLib/XCTestCase/XCTestCase+GREYTest.h",
@@ -411,7 +419,7 @@ source_set("test_lib") {
     "src/TestLib/XCTestCase/XCUIApplication+GREYEnvironment.h",
     "src/TestLib/XCTestCase/XCUIApplication+GREYEnvironment.m",
     "src/UILib/GREYElementHierarchyStub.m",
-    "src/UILib/GREYScreenshotUtilStub.m",
+    "src/UILib/GREYScreenshotterStub.m",
     "src/UILib/GREYVisibilityCheckerStub.m",
   ]