make 'test_shell' target depend on everything needed to pass layout_tests

This adds project dependencies to test_shell so that all (and only?)
the targets needed for the layout_tests to run cleanly are built. On most
platforms this is test_shell, npapi_test_plugin, and test_worker, and on
the Mac this adds the layout_test_helper binary as well

also, this moves image_diff from chrome/tools/test to tools/

R=mmentovai@google.com, darin@google.com
BUG=none
TEST=none

Review URL: http://codereview.chromium.org/149714

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21252 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 28 insertions, 14 deletions

diff --git a/build/all.gyp b/build/all.gyp
index 14befd5..998d4d1 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -94,7 +94,7 @@
           'target_name': 'build_for_layout_tests',
           'type': 'none',
           'dependencies': [
-            '../chrome/chrome.gyp:image_diff',
+            '../tools/image_diff/image_diff.gyp:image_diff',
             '../webkit/tools/test_shell/test_shell.gyp:test_shell',
             '../webkit/tools/test_shell/test_shell.gyp:test_shell_tests',
           ],
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 7d227aa..dfb43e5 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -3246,18 +3246,6 @@
       ],
     },
     {
-      'target_name': 'image_diff',
-      'type': 'executable',
-      'msvs_guid': '50B079C7-CD01-42D3-B8C4-9F8D9322E822',
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../base/base.gyp:base_gfx',
-      ],
-      'sources': [
-        'tools/test/image_diff/image_diff.cc',
-      ],
-    },
-    {
       # This target contains mocks and test utilities that don't belong in
       # production libraries but are used by more than one test executable.
       'target_name': 'test_support_common',
diff --git a/chrome/tools/test/image_diff/image_diff.cc b/tools/image_diff/image_diff.cc
index 044b89c..044b89c 100644
--- a/chrome/tools/test/image_diff/image_diff.cc
+++ b/tools/image_diff/image_diff.cc
diff --git a/tools/image_diff/image_diff.gyp b/tools/image_diff/image_diff.gyp
new file mode 100644
index 0000000..c1baab8
--- /dev/null
+++ b/tools/image_diff/image_diff.gyp
@@ -0,0 +1,23 @@
+# Copyright (c) 2009 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.
+
+{
+  'includes': [
+    '../../build/common.gypi',
+  ],
+  'targets': [
+    {
+      'target_name': 'image_diff',
+      'type': 'executable',
+      'msvs_guid': '50B079C7-CD01-42D3-B8C4-9F8D9322E822',
+      'dependencies': [
+        '../../base/base.gyp:base',
+        '../../base/base.gyp:base_gfx',
+      ],
+      'sources': [
+        'image_diff.cc',
+      ],
+    },
+  ]
+}
diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp
index 8313eff..238a927 100644
--- a/webkit/tools/test_shell/test_shell.gyp
+++ b/webkit/tools/test_shell/test_shell.gyp
@@ -182,6 +182,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',
@@ -205,6 +207,7 @@
       },
       'conditions': [
         ['OS=="win"', {
+          'dependencies': ['test_worker'],
           'resource_include_dirs': [
             '<(SHARED_INTERMEDIATE_DIR)/webkit',
           ],
@@ -249,7 +252,7 @@
         }],
         ['OS=="mac"', {
           'product_name': 'TestShell',
-          'dependencies': ['layout_test_helper'],
+          'dependencies': ['layout_test_helper', 'test_worker'],
           'variables': {
             'repack_path': '../../../tools/data_pack/repack.py',
           },