re-do CL 21252 - move image_diff to tools, add deps to test_shell...

webkit/tools/test_shell/test_shell.gyp

Index: webkit/tools/test_shell/test_shell.gyp
===================================================================
--- webkit/tools/test_shell/test_shell.gyp	(revision 21338)
+++ webkit/tools/test_shell/test_shell.gyp	(working copy)
@@ -183,6 +183,8 @@
       'msvs_guid': 'FA39524D-3067-4141-888D-28A86C66F2B9',
       'dependencies': [
         'test_shell_common',
+        'npapi_layout_test_plugin',
+        '../../../tools/image_diff/image_diff.gyp:image_diff',
       ],
       'sources': [
         'test_shell_main.cc',
@@ -206,6 +208,7 @@
       },
       'conditions': [
         ['OS=="win"', {
+          'dependencies': ['test_worker'],
           'resource_include_dirs': [
             '<(SHARED_INTERMEDIATE_DIR)/webkit',
           ],
@@ -250,7 +253,7 @@
         }],
         ['OS=="mac"', {
           'product_name': 'TestShell',
-          'dependencies': ['layout_test_helper'],
+          'dependencies': ['layout_test_helper','test_worker'],
           'variables': {
             'repack_path': '../../../tools/data_pack/repack.py',
           },