Refactor web shell integration tests utilities.

ios/web/ios_web_shell_tests.gyp

Index: ios/web/ios_web_shell_tests.gyp
diff --git a/ios/web/ios_web_shell_tests.gyp b/ios/web/ios_web_shell_tests.gyp
index 685b266f0850f2c5c8f2cc99756ac31f3e110f39..9a191f9ca461fdbc48809be41e687f0d8aab91b2 100644
--- a/ios/web/ios_web_shell_tests.gyp
+++ b/ios/web/ios_web_shell_tests.gyp
@@ -57,8 +57,7 @@
         ]
       },
       'dependencies': [
-        'ios_web_shell_test_support',
-        '<(DEPTH)/ios/third_party/earl_grey/earl_grey.gyp:EarlGrey',
+        'ios_web_shell_earl_grey_test_support',
       ],
       'sources': [
         'shell/test/web_shell_navigation_egtest.mm',
@@ -85,23 +84,22 @@
     {
       # TODO(crbug.com/606815): Refactor out code that is common across Chrome
       # and the web shell.
-      'target_name': 'ios_web_shell_test_support',
+      'target_name': 'ios_web_shell_earl_grey_test_support',
       'type': 'static_library',
       'dependencies': [
         '<(DEPTH)/ios/third_party/earl_grey/earl_grey.gyp:EarlGrey',
         'ios_web.gyp:ios_web_test_support',
       ],
+      'export_dependent_settings': [
+        '<(DEPTH)/ios/third_party/earl_grey/earl_grey.gyp:EarlGrey',
+      ],
       'sources': [
-        'public/test/http_server_util.h',
-        'public/test/http_server_util.mm',
-        'shell/test/navigation_test_util.h',
-        'shell/test/navigation_test_util.mm',
-        'shell/test/shell_matchers.h',
-        'shell/test/shell_matchers.mm',
-        'shell/test/web_shell_test_util.h',
-        'shell/test/web_shell_test_util.mm',
-        'shell/test/web_view_matchers.h',
-        'shell/test/web_view_matchers.mm',
+        'public/test/earl_grey/web_view_matchers.h',
+        'public/test/earl_grey/web_view_matchers.mm',
+        'shell/test/app/web_shell_test_util.h',
+        'shell/test/app/web_shell_test_util.mm',
+        'shell/test/earl_grey/shell_matchers.h',
+        'shell/test/earl_grey/shell_matchers.mm',
       ],
     },
   ],