Include test_shell.gypi in webkit.gyp instead of maintaining a distinct

test_shell.gyp.  This allows the removal of webkit.gyp:pull_in_test_shell,
eliminating the circular relationship between webkit.gyp and test_shell.gyp.

The expected semantics of building all of test_shell during a webkit.gyp:All
build is performed are retained.

This change depends on GYP r781 (in Chromium at r38526) for GYP suffix
operator path section treatment.  It also depends on Chromium r38519 and
r38658 for common.gypi treatment of chromium_code.

BUG=33186
TEST=Xcode no longer holds stale project files in memory
Review URL: http://codereview.chromium.org/602006

git-svn-id: http://src.chromium.org/svn/trunk/src/build@38664 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

all.gyp

@@ -37,7 +37,6 @@
         '../third_party/WebKit/WebKit/chromium/WebKit.gyp:*',
         '../third_party/zlib/zlib.gyp:*',
         '../webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp:*',
-        '../webkit/tools/test_shell/test_shell.gyp:*',
         '../webkit/webkit.gyp:*',
         'util/build_util.gyp:*',
         'temp_gyp/googleurl.gyp:*',
@@ -213,12 +212,12 @@
             '../ipc/ipc.gyp:ipc_tests',
             '../media/media.gyp:media_unittests',
             '../printing/printing.gyp:printing_unittests',
-            '../webkit/tools/test_shell/test_shell.gyp:npapi_layout_test_plugin',
+            '../webkit/webkit.gyp:npapi_layout_test_plugin',
             # TODO(nsylvain) ui_tests.exe depends on test_shell_common.
             # This should:
             # 1) not be the case. OR.
             # 2) be expressed in the ui tests dependencies.
-            '../webkit/tools/test_shell/test_shell.gyp:test_shell_common',
+            '../webkit/webkit.gyp:test_shell_common',
             'temp_gyp/googleurl.gyp:googleurl_unittests',
             '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
             '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests',