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',

[baxley, 2016/05/05 17:01:52]

I didn't want to go crazy creating a new target for each type of test_support
(web, web matchers, web shell helpers, web shell matchers, ...), so I put all
earl_grey and web shell specific utilities in this support target, and
everything that is web only, went into ios_web.gyp:ios_web_test_support.

[Eugene But (OOO till 7-30), 2016/05/05 18:01:11]

That's fine, but I think the name should be different. F.e. 'shell/test/app' is
not related to EG and 'public/test/earl_grey/' is not related to Shell.

How about ios_web_uiintegration_tests_support? Dropping ui may not be very good
as well because ios_web has integration tests, which are neither EG, nor KIF.
Thoughts? 

[baxley, 2016/05/05 18:33:18]

I think it's a difference of what the name means. I made it
ios_web_shell_earl_grey_test_support, as it includes all the test support to run
earl grey tests on the web shell, which is why it includes unrelated code.

While I understand your suggestion, my concern is that
ios_web_uiintegration_tests_support is saying it has UI test support, when it
really has EarlGrey support.

Maybe the problem would probably be better solved if I just split it to smaller
targets, though I'm concerned we'd have too many small targets? I guess that's
not a bad thing...
ios_web_shell_test_support (contain web_shell_test_util)
ios_web.gyp:ios_web_earl_grey_test_support (contain web_view_matchers)
ios_web_shell_earl_grey_test_support (contain shell_matchers)

[Eugene But (OOO till 7-30), 2016/05/05 18:50:31]

I small targets sounds like a better approach. Do you need more than 2 small
targets (one for EG and one for WebShell)?

[baxley, 2016/05/05 21:13:53]

After offline discussion, I'll leave it as is. Splitting it into logical groups
would be having one set of .h/.mm per target. Better to have just one target. We
can split it up later, as necessary.

       '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',
       ],
     },
   ],