Refactor web shell integration tests utilities.

ios/web/ios_web_shell_tests.gyp

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 39 matching lines @@
         ],
       },
       'xcode_settings': {
         'INFOPLIST_FILE': 'shell/test/Host-Info.plist',
         'OTHER_LDFLAGS': [
           '-Xlinker', '-rpath', '-Xlinker', '@executable_path/Frameworks',
           '-Xlinker', '-rpath', '-Xlinker', '@loader_path/Frameworks'
         ]
       },
       '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',
       ],
       'postbuilds': [
         {
           'postbuild_name': 'Copy OCHamcrest to TEST_HOST',
           'action': [
             'ditto',
             '${BUILT_PRODUCTS_DIR}/OCHamcrest.framework',
             '${BUILT_PRODUCTS_DIR}/<(_target_name).app/Frameworks/OCHamcrest.framework',
           ],
         },
         {
           'postbuild_name': 'Copy EarlGrey to TEST_HOST',
           'action': [
             'ditto',
             '${BUILT_PRODUCTS_DIR}/EarlGrey.framework',
             '${BUILT_PRODUCTS_DIR}/<(_target_name).app/Frameworks/EarlGrey.framework',
           ],
         },
       ],
     },
     {
       # 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',
       ],
     },
   ],
 }