Move web shell test support into a separate target.

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 409e48607e7213eb11cd6468aae473ea582c8cae..4bc2817b051221bb8eb2bd407f948c7117e81b29 100644
--- a/ios/web/ios_web_shell_tests.gyp
+++ b/ios/web/ios_web_shell_tests.gyp
@@ -53,21 +53,11 @@
         'INFOPLIST_FILE': 'shell/test/Host-Info.plist',
       },
       'dependencies': [
+        'ios_web_shell_test_support',
         '<(DEPTH)/ios/third_party/earl_grey/earl_grey.gyp:EarlGrey',
-        'ios_web.gyp:ios_web_test_support',
       ],
       '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_navigation_egtest.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',
       ],
       'postbuilds': [
         {
@@ -88,5 +78,27 @@
         },
       ],
     },
+    {
+      # TODO(crbug.com/606815): Refactor out code that is common across Chrome
+      # and the web shell.
+      'target_name': 'ios_web_shell_test_support',
+      'type': 'static_library',
+      'dependencies': [
+        '<(DEPTH)/ios/third_party/earl_grey/earl_grey.gyp:EarlGrey',
+        'ios_web.gyp:ios_web_test_support',
+      ],
+      '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',
+      ],
+    },
   ],
 }