5 files changed, 14 insertions, 28 deletions
diff --git a/build/all.gyp b/build/all.gyp
index 998d4d1..14befd5 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -94,7 +94,7 @@
           'target_name': 'build_for_layout_tests',
           'type': 'none',
           'dependencies': [
-            '../tools/image_diff/image_diff.gyp:image_diff',
+            '../chrome/chrome.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 ae6c0a4..22fc3ab 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -3246,6 +3246,18 @@
       ],
     },
     {
+      '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/tools/image_diff/image_diff.cc b/chrome/tools/test/image_diff/image_diff.cc
index 044b89c..044b89c 100644
--- a/tools/image_diff/image_diff.cc
+++ b/chrome/tools/test/image_diff/image_diff.cc
diff --git a/tools/image_diff/image_diff.gyp b/tools/image_diff/image_diff.gyp
deleted file mode 100644
index c1baab8..0000000
--- a/tools/image_diff/image_diff.gyp
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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 238a927..8313eff 100644
--- a/webkit/tools/test_shell/test_shell.gyp
+++ b/webkit/tools/test_shell/test_shell.gyp
@@ -182,8 +182,6 @@
       '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',
@@ -207,7 +205,6 @@
       },
       'conditions': [
         ['OS=="win"', {
-          'dependencies': ['test_worker'],
           'resource_include_dirs': [
             '<(SHARED_INTERMEDIATE_DIR)/webkit',
           ],
@@ -252,7 +249,7 @@
         }],
         ['OS=="mac"', {
           'product_name': 'TestShell',
-          'dependencies': ['layout_test_helper', 'test_worker'],
+          'dependencies': ['layout_test_helper'],
           'variables': {
             'repack_path': '../../../tools/data_pack/repack.py',
           },