Move C++ code from webkit/tools/test_shell to webkit/support

This code is simple/test/mock implementations of APIs to use in DumpRenderTree,
webkit_unit_tests, and various other bits of unit test code around the codebase.
Nothing here is used for test_shell since there is no test_shell any more.

This moves the code to webkit/support/ along with the rest of DRT/w_u_t support
code. Hopefully we'll be able to delete most of this soon along with
DumpRenderTree. In the meantime this simplifies webkit/

R=darin@chromium.org

Review URL: https://codereview.chromium.org/15946006

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

37 files changed, 301 insertions, 324 deletions

diff --git a/webkit/plugins/webkit_plugins.gypi b/webkit/plugins/webkit_plugins.gypi
index 2b5738b..6df48631 100644
--- a/webkit/plugins/webkit_plugins.gypi
+++ b/webkit/plugins/webkit_plugins.gypi
@@ -246,9 +246,6 @@
             '<(DEPTH)/build/linux/system.gyp:gtk',
           ],
           'sources/': [['exclude', '_x11\\.cc$']],
-          'sources!': [
-            'plugins/plugin_stubs.cc',
-          ],
         }],
         ['use_aura==1', {
           'sources/': [
@@ -285,11 +282,182 @@
           'include_dirs': [
             '<(DEPTH)/third_party/wtl/include',
           ],
-          'sources!': [
-            'plugins/plugin_stubs.cc',
-          ],
         }],
       ],
-    }
+    },
+    {
+      'target_name': 'test_mock_plugin_list',
+      'type': 'static_library',
+      'dependencies': [
+        '<(DEPTH)/webkit/support/webkit_support.gyp:glue'
+      ],
+      'sources': [
+        '../plugins/npapi/mock_plugin_list.cc',
+        '../plugins/npapi/mock_plugin_list.h',
+      ]
+    },
+    {
+      'target_name': 'pull_in_copy_TestNetscapePlugIn',
+      'type': 'none',
+      'dependencies': [
+        '<(DEPTH)/third_party/WebKit/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:copy_TestNetscapePlugIn'
+      ],
+    },
+  ],
+  'conditions': [
+    ['OS!="android" and OS!="ios"', {
+      # npapi test plugin doesn't build on android or ios
+      'targets': [
+        {
+          'target_name': 'npapi_test_common',
+          'type': 'static_library',
+          'dependencies': [
+            '<(DEPTH)/base/base.gyp:base',
+            '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
+          ],
+          'sources': [
+            '../plugins/npapi/test/npapi_constants.cc',
+            '../plugins/npapi/test/npapi_constants.h',
+            '../plugins/npapi/test/plugin_client.cc',
+            '../plugins/npapi/test/plugin_client.h',
+            '../plugins/npapi/test/plugin_test.cc',
+            '../plugins/npapi/test/plugin_test.h',
+            '../plugins/npapi/test/plugin_test_factory.h',
+          ],
+          'export_dependent_settings': [
+            '<(DEPTH)/base/base.gyp:base',
+          ],
+        },
+        {
+          'target_name': 'npapi_test_plugin',
+          'type': 'loadable_module',
+          'variables': {
+            'chromium_code': 1,
+          },
+          'mac_bundle': 1,
+          'dependencies': [
+            '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
+            'npapi_test_common',
+          ],
+          'sources': [
+            '../plugins/npapi/test/npapi_test.cc',
+            '../plugins/npapi/test/npapi_test.def',
+            '../plugins/npapi/test/npapi_test.rc',
+            '../plugins/npapi/test/plugin_arguments_test.cc',
+            '../plugins/npapi/test/plugin_arguments_test.h',
+            '../plugins/npapi/test/plugin_create_instance_in_paint.cc',
+            '../plugins/npapi/test/plugin_create_instance_in_paint.h',
+            '../plugins/npapi/test/plugin_delete_plugin_in_deallocate_test.cc',
+            '../plugins/npapi/test/plugin_delete_plugin_in_deallocate_test.h',
+            '../plugins/npapi/test/plugin_delete_plugin_in_stream_test.cc',
+            '../plugins/npapi/test/plugin_delete_plugin_in_stream_test.h',
+            '../plugins/npapi/test/plugin_execute_stream_javascript.cc',
+            '../plugins/npapi/test/plugin_execute_stream_javascript.h',
+            '../plugins/npapi/test/plugin_get_javascript_url_test.cc',
+            '../plugins/npapi/test/plugin_get_javascript_url_test.h',
+            '../plugins/npapi/test/plugin_get_javascript_url2_test.cc',
+            '../plugins/npapi/test/plugin_get_javascript_url2_test.h',
+            '../plugins/npapi/test/plugin_geturl_test.cc',
+            '../plugins/npapi/test/plugin_geturl_test.h',
+            '../plugins/npapi/test/plugin_javascript_open_popup.cc',
+            '../plugins/npapi/test/plugin_javascript_open_popup.h',
+            '../plugins/npapi/test/plugin_new_fails_test.cc',
+            '../plugins/npapi/test/plugin_new_fails_test.h',
+            '../plugins/npapi/test/plugin_npobject_identity_test.cc',
+            '../plugins/npapi/test/plugin_npobject_identity_test.h',
+            '../plugins/npapi/test/plugin_npobject_lifetime_test.cc',
+            '../plugins/npapi/test/plugin_npobject_lifetime_test.h',
+            '../plugins/npapi/test/plugin_npobject_proxy_test.cc',
+            '../plugins/npapi/test/plugin_npobject_proxy_test.h',
+            '../plugins/npapi/test/plugin_schedule_timer_test.cc',
+            '../plugins/npapi/test/plugin_schedule_timer_test.h',
+            '../plugins/npapi/test/plugin_setup_test.cc',
+            '../plugins/npapi/test/plugin_setup_test.h',
+            '../plugins/npapi/test/plugin_thread_async_call_test.cc',
+            '../plugins/npapi/test/plugin_thread_async_call_test.h',
+            '../plugins/npapi/test/plugin_windowed_test.cc',
+            '../plugins/npapi/test/plugin_windowed_test.h',
+            '../plugins/npapi/test/plugin_private_test.cc',
+            '../plugins/npapi/test/plugin_private_test.h',
+            '../plugins/npapi/test/plugin_test_factory.cc',
+            '../plugins/npapi/test/plugin_window_size_test.cc',
+            '../plugins/npapi/test/plugin_window_size_test.h',
+            '../plugins/npapi/test/plugin_windowless_test.cc',
+            '../plugins/npapi/test/plugin_windowless_test.h',
+            '../plugins/npapi/test/resource.h',
+          ],
+          'include_dirs': [
+            '..',
+          ],
+          'xcode_settings': {
+            'INFOPLIST_FILE': '<(DEPTH)/webkit/plugins/npapi/test/Info.plist',
+          },
+          'conditions': [
+            ['OS!="win"', {
+              'sources!': [
+                # TODO(port):  Port these.
+                 # plugin_npobject_lifetime_test.cc has win32-isms
+                #   (HWND, CALLBACK).
+                '../plugins/npapi/test/plugin_npobject_lifetime_test.cc',
+                 # The window APIs are necessarily platform-specific.
+                '../plugins/npapi/test/plugin_window_size_test.cc',
+                '../plugins/npapi/test/plugin_windowed_test.cc',
+                 # Seems windows specific.
+                '../plugins/npapi/test/plugin_create_instance_in_paint.cc',
+                '../plugins/npapi/test/plugin_create_instance_in_paint.h',
+                 # windows-specific resources
+                '../plugins/npapi/test/npapi_test.def',
+                '../plugins/npapi/test/npapi_test.rc',
+              ],
+            }],
+            ['OS=="mac"', {
+              'product_extension': 'plugin',
+              'link_settings': {
+                'libraries': [
+                  '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
+                ],
+              },
+            }],
+            ['os_posix == 1 and OS != "mac" and (target_arch == "x64" or target_arch == "arm")', {
+              # Shared libraries need -fPIC on x86-64
+              'cflags': ['-fPIC']
+            }],
+          ],
+        },
+        {
+          'target_name': 'copy_npapi_test_plugin',
+          'type': 'none',
+          'dependencies': [
+            'npapi_test_plugin',
+          ],
+          'conditions': [
+            ['OS=="win"', {
+              'copies': [
+                {
+                  'destination': '<(PRODUCT_DIR)/plugins',
+                  'files': ['<(PRODUCT_DIR)/npapi_test_plugin.dll'],
+                },
+              ],
+            }],
+            ['OS=="mac"', {
+              'copies': [
+                {
+                  'destination': '<(PRODUCT_DIR)/plugins/',
+                  'files': ['<(PRODUCT_DIR)/npapi_test_plugin.plugin'],
+                },
+              ]
+            }],
+            ['os_posix == 1 and OS != "mac"', {
+              'copies': [
+                {
+                  'destination': '<(PRODUCT_DIR)/plugins',
+                  'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
+                },
+              ],
+            }],
+          ],
+        },
+      ],
+    }],
   ],
 }
diff --git a/webkit/tools/test_shell/mac/DumpRenderTreePasteboard.h b/webkit/support/mac/DumpRenderTreePasteboard.h
index 41796ea3..41796ea3 100644
--- a/webkit/tools/test_shell/mac/DumpRenderTreePasteboard.h
+++ b/webkit/support/mac/DumpRenderTreePasteboard.h
diff --git a/webkit/tools/test_shell/mac/DumpRenderTreePasteboard.m b/webkit/support/mac/DumpRenderTreePasteboard.m
index 3e3cf1c..3e3cf1c 100644
--- a/webkit/tools/test_shell/mac/DumpRenderTreePasteboard.m
+++ b/webkit/support/mac/DumpRenderTreePasteboard.m
diff --git a/webkit/tools/test_shell/mock_webclipboard_impl.cc b/webkit/support/mock_webclipboard_impl.cc
index ec78d0a..e71681c 100644
--- a/webkit/tools/test_shell/mock_webclipboard_impl.cc
+++ b/webkit/support/mock_webclipboard_impl.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/tools/test_shell/mock_webclipboard_impl.h"
+#include "webkit/support/mock_webclipboard_impl.h"
 
 #include <algorithm>
 
diff --git a/webkit/tools/test_shell/mock_webclipboard_impl.h b/webkit/support/mock_webclipboard_impl.h
index 1ec33b2..845d1bf 100644
--- a/webkit/tools/test_shell/mock_webclipboard_impl.h
+++ b/webkit/support/mock_webclipboard_impl.h
@@ -7,8 +7,8 @@
 // clipboard, which allows for running them in parallel and having the tests
 // not interact with actual user actions.
 
-#ifndef WEBKIT_TOOLS_TEST_SHELL_MOCK_WEBCLIPBOARD_IMPL_H_
-#define WEBKIT_TOOLS_TEST_SHELL_MOCK_WEBCLIPBOARD_IMPL_H_
+#ifndef WEBKIT_SUPPORT_MOCK_WEBCLIPBOARD_IMPL_H_
+#define WEBKIT_SUPPORT_MOCK_WEBCLIPBOARD_IMPL_H_
 
 #include <map>
 
@@ -57,4 +57,4 @@ class MockWebClipboardImpl : public WebKit::WebClipboard {
   bool m_writeSmartPaste;
 };
 
-#endif  // WEBKIT_TOOLS_TEST_SHELL_MOCK_WEBCLIPBOARD_IMPL_H_
+#endif  // WEBKIT_SUPPORT_MOCK_WEBCLIPBOARD_IMPL_H_
diff --git a/webkit/support/platform_support_android.cc b/webkit/support/platform_support_android.cc
index 3c1e2c4..581c974 100644
--- a/webkit/support/platform_support_android.cc
+++ b/webkit/support/platform_support_android.cc
@@ -20,8 +20,8 @@
 #include "ui/android/ui_jni_registrar.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gl/android/gl_jni_registrar.h"
+#include "webkit/support/simple_resource_loader_bridge.h"
 #include "webkit/support/test_webkit_platform_support.h"
-#include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
 
 namespace {
 
diff --git a/webkit/support/platform_support_mac.mm b/webkit/support/platform_support_mac.mm
index 5abd93f..9a48d95 100644
--- a/webkit/support/platform_support_mac.mm
+++ b/webkit/support/platform_support_mac.mm
@@ -20,9 +20,9 @@
 #include "grit/webkit_resources.h"
 #include "ui/base/resource/data_pack.h"
 #include "webkit/plugins/npapi/plugin_list.h"
-#include "webkit/support/test_webkit_platform_support.h"
 #import "webkit/support/drt_application_mac.h"
-#import "webkit/tools/test_shell/mac/DumpRenderTreePasteboard.h"
+#import "webkit/support/mac/DumpRenderTreePasteboard.h"
+#include "webkit/support/test_webkit_platform_support.h"
 
 static ui::DataPack* g_resource_data_pack = NULL;
 
diff --git a/webkit/tools/test_shell/simple_appcache_system.cc b/webkit/support/simple_appcache_system.cc
index 7c6e0ed..1305bc9 100644
--- a/webkit/tools/test_shell/simple_appcache_system.cc
+++ b/webkit/support/simple_appcache_system.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/tools/test_shell/simple_appcache_system.h"
+#include "webkit/support/simple_appcache_system.h"
 
 #include <string>
 #include <vector>
@@ -13,7 +13,7 @@
 #include "base/synchronization/waitable_event.h"
 #include "webkit/appcache/appcache_interceptor.h"
 #include "webkit/appcache/web_application_cache_host_impl.h"
-#include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
+#include "webkit/support/simple_resource_loader_bridge.h"
 
 using WebKit::WebApplicationCacheHost;
 using WebKit::WebApplicationCacheHostClient;
diff --git a/webkit/tools/test_shell/simple_appcache_system.h b/webkit/support/simple_appcache_system.h
index e6639ad..c07a52f 100644
--- a/webkit/tools/test_shell/simple_appcache_system.h
+++ b/webkit/support/simple_appcache_system.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_TOOLS_TEST_SHELL_SIMPLE_APPCACHE_SYSTEM_H_
-#define WEBKIT_TOOLS_TEST_SHELL_SIMPLE_APPCACHE_SYSTEM_H_
+#ifndef WEBKIT_SUPPORT_SIMPLE_APPCACHE_SYSTEM_H_
+#define WEBKIT_SUPPORT_SIMPLE_APPCACHE_SYSTEM_H_
 
 #include "base/files/file_path.h"
 #include "base/message_loop.h"
@@ -133,4 +133,4 @@ class SimpleAppCacheSystem {
   static SimpleAppCacheSystem* instance_;
 };
 
-#endif  // WEBKIT_TOOLS_TEST_SHELL_SIMPLE_APPCACHE_SYSTEM_H_
+#endif  // WEBKIT_SUPPORT_SIMPLE_APPCACHE_SYSTEM_H_
diff --git a/webkit/tools/test_shell/simple_clipboard_impl.cc b/webkit/support/simple_clipboard_impl.cc
index 4e63b8ab..ac10492 100644
--- a/webkit/tools/test_shell/simple_clipboard_impl.cc
+++ b/webkit/support/simple_clipboard_impl.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/tools/test_shell/simple_clipboard_impl.h"
+#include "webkit/support/simple_clipboard_impl.h"
 
 #include <string>
 
diff --git a/webkit/tools/test_shell/simple_clipboard_impl.h b/webkit/support/simple_clipboard_impl.h
index 9a8b438..0d3d146 100644
--- a/webkit/tools/test_shell/simple_clipboard_impl.h
+++ b/webkit/support/simple_clipboard_impl.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_TOOLS_TEST_SHELL_SIMPLE_CLIPBOARD_IMPL_H_
-#define WEBKIT_TOOLS_TEST_SHELL_SIMPLE_CLIPBOARD_IMPL_H_
+#ifndef WEBKIT_SUPPORT_SIMPLE_CLIPBOARD_IMPL_H_
+#define WEBKIT_SUPPORT_SIMPLE_CLIPBOARD_IMPL_H_
 
 #include "base/compiler_specific.h"
 #include "webkit/glue/clipboard_client.h"
@@ -40,4 +40,4 @@ class SimpleClipboardClient : public webkit_glue::ClipboardClient {
   virtual WriteContext* CreateWriteContext() OVERRIDE;
 };
 
-#endif  // WEBKIT_TOOLS_TEST_SHELL_SIMPLE_CLIPBOARD_IMPL_H_
+#endif  // WEBKIT_SUPPORT_SIMPLE_CLIPBOARD_IMPL_H_
diff --git a/webkit/tools/test_shell/simple_dom_storage_system.cc b/webkit/support/simple_dom_storage_system.cc
index 3599bec..3f98697 100644
--- a/webkit/tools/test_shell/simple_dom_storage_system.cc
+++ b/webkit/support/simple_dom_storage_system.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/tools/test_shell/simple_dom_storage_system.h"
+#include "webkit/support/simple_dom_storage_system.h"
 
 #include "base/auto_reset.h"
 #include "googleurl/src/gurl.h"
diff --git a/webkit/tools/test_shell/simple_dom_storage_system.h b/webkit/support/simple_dom_storage_system.h
index 8f46542..5158794 100644
--- a/webkit/tools/test_shell/simple_dom_storage_system.h
+++ b/webkit/support/simple_dom_storage_system.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_TOOLS_TEST_SHELL_SIMPLE_DOM_STORAGE_SYSTEM_H_
-#define WEBKIT_TOOLS_TEST_SHELL_SIMPLE_DOM_STORAGE_SYSTEM_H_
+#ifndef WEBKIT_SUPPORT_SIMPLE_DOM_STORAGE_SYSTEM_H_
+#define WEBKIT_SUPPORT_SIMPLE_DOM_STORAGE_SYSTEM_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ -76,4 +76,4 @@ class SimpleDomStorageSystem
   static SimpleDomStorageSystem* g_instance_;
 };
 
-#endif  // WEBKIT_TOOLS_TEST_SHELL_SIMPLE_DOM_STORAGE_SYSTEM_H_
+#endif  // WEBKIT_SUPPORT_SIMPLE_DOM_STORAGE_SYSTEM_H_
diff --git a/webkit/tools/test_shell/simple_file_system.cc b/webkit/support/simple_file_system.cc
index 75cbd72..6318e2b 100644
--- a/webkit/tools/test_shell/simple_file_system.cc
+++ b/webkit/support/simple_file_system.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/tools/test_shell/simple_file_system.h"
+#include "webkit/support/simple_file_system.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
@@ -27,7 +27,7 @@
 #include "webkit/browser/fileapi/mock_file_system_context.h"
 #include "webkit/common/fileapi/directory_entry.h"
 #include "webkit/common/fileapi/file_system_util.h"
-#include "webkit/tools/test_shell/simple_file_writer.h"
+#include "webkit/support/simple_file_writer.h"
 
 using base::WeakPtr;
 
diff --git a/webkit/tools/test_shell/simple_file_system.h b/webkit/support/simple_file_system.h
index 464c591..6430aa0 100644
--- a/webkit/tools/test_shell/simple_file_system.h
+++ b/webkit/support/simple_file_system.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_TOOLS_TEST_SHELL_SIMPLE_FILE_SYSTEM_H_
-#define WEBKIT_TOOLS_TEST_SHELL_SIMPLE_FILE_SYSTEM_H_
+#ifndef WEBKIT_SUPPORT_SIMPLE_FILE_SYSTEM_H_
+#define WEBKIT_SUPPORT_SIMPLE_FILE_SYSTEM_H_
 
 #include <vector>
 
@@ -157,4 +157,4 @@ class SimpleFileSystem
   DISALLOW_COPY_AND_ASSIGN(SimpleFileSystem);
 };
 
-#endif  // WEBKIT_TOOLS_TEST_SHELL_SIMPLE_FILE_SYSTEM_H_
+#endif  // WEBKIT_SUPPORT_SIMPLE_FILE_SYSTEM_H_
diff --git a/webkit/tools/test_shell/simple_file_writer.cc b/webkit/support/simple_file_writer.cc
index a09df46..4c5837a 100644
--- a/webkit/tools/test_shell/simple_file_writer.cc
+++ b/webkit/support/simple_file_writer.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/tools/test_shell/simple_file_writer.h"
+#include "webkit/support/simple_file_writer.h"
 
 #include "base/bind.h"
 #include "base/location.h"
@@ -14,7 +14,7 @@
 #include "webkit/browser/fileapi/file_system_url.h"
 #include "webkit/common/fileapi/file_system_types.h"
 #include "webkit/glue/webkit_glue.h"
-#include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
+#include "webkit/support/simple_resource_loader_bridge.h"
 
 using fileapi::FileSystemURL;
 using fileapi::FileSystemContext;
diff --git a/webkit/tools/test_shell/simple_file_writer.h b/webkit/support/simple_file_writer.h
index 41f11fa..778fb55 100644
--- a/webkit/tools/test_shell/simple_file_writer.h
+++ b/webkit/support/simple_file_writer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_TOOLS_TEST_SHELL_SIMPLE_FILE_WRITER_H_
-#define WEBKIT_TOOLS_TEST_SHELL_SIMPLE_FILE_WRITER_H_
+#ifndef WEBKIT_SUPPORT_SIMPLE_FILE_WRITER_H_
+#define WEBKIT_SUPPORT_SIMPLE_FILE_WRITER_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
@@ -50,4 +50,4 @@ class SimpleFileWriter : public fileapi::WebFileWriterBase,
   static net::URLRequestContext* request_context_;
 };
 
-#endif  // WEBKIT_TOOLS_TEST_SHELL_SIMPLE_FILE_WRITER_H_
+#endif  // WEBKIT_SUPPORT_SIMPLE_FILE_WRITER_H_
diff --git a/webkit/tools/test_shell/simple_resource_loader_bridge.cc b/webkit/support/simple_resource_loader_bridge.cc
index 0e37a94..b43c094 100644
--- a/webkit/tools/test_shell/simple_resource_loader_bridge.cc
+++ b/webkit/support/simple_resource_loader_bridge.cc
@@ -30,7 +30,7 @@
 // perform URL loads.  See renderer/resource_dispatcher.h for details on an
 // alternate implementation that defers fetching to another process.
 
-#include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
+#include "webkit/support/simple_resource_loader_bridge.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ -71,12 +71,12 @@
 #include "webkit/glue/resource_loader_bridge.h"
 #include "webkit/glue/resource_request_body.h"
 #include "webkit/glue/webkit_glue.h"
-#include "webkit/tools/test_shell/simple_appcache_system.h"
-#include "webkit/tools/test_shell/simple_file_system.h"
-#include "webkit/tools/test_shell/simple_file_writer.h"
-#include "webkit/tools/test_shell/simple_socket_stream_bridge.h"
-#include "webkit/tools/test_shell/test_shell_request_context.h"
-#include "webkit/tools/test_shell/test_shell_webblobregistry_impl.h"
+#include "webkit/support/simple_appcache_system.h"
+#include "webkit/support/simple_file_system.h"
+#include "webkit/support/simple_file_writer.h"
+#include "webkit/support/simple_socket_stream_bridge.h"
+#include "webkit/support/test_shell_request_context.h"
+#include "webkit/support/test_shell_webblobregistry_impl.h"
 
 #if defined(OS_MACOSX) || defined(OS_WIN)
 #include "crypto/nss_util.h"
diff --git a/webkit/tools/test_shell/simple_resource_loader_bridge.h b/webkit/support/simple_resource_loader_bridge.h
index 35d38b5..ea73ee7 100644
--- a/webkit/tools/test_shell/simple_resource_loader_bridge.h
+++ b/webkit/support/simple_resource_loader_bridge.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_TOOLS_TEST_SHELL_SIMPLE_RESOURCE_LOADER_BRIDGE_H__
-#define WEBKIT_TOOLS_TEST_SHELL_SIMPLE_RESOURCE_LOADER_BRIDGE_H__
+#ifndef WEBKIT_SUPPORT_SIMPLE_RESOURCE_LOADER_BRIDGE_H__
+#define WEBKIT_SUPPORT_SIMPLE_RESOURCE_LOADER_BRIDGE_H__
 
 #include <string>
 #include "base/message_loop_proxy.h"
@@ -58,4 +58,4 @@ class SimpleResourceLoaderBridge {
     const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info);
 };
 
-#endif  // WEBKIT_TOOLS_TEST_SHELL_SIMPLE_RESOURCE_LOADER_BRIDGE_H__
+#endif  // WEBKIT_SUPPORT_SIMPLE_RESOURCE_LOADER_BRIDGE_H__
diff --git a/webkit/tools/test_shell/simple_socket_stream_bridge.cc b/webkit/support/simple_socket_stream_bridge.cc
index 85bdc06..a0e425d 100644
--- a/webkit/tools/test_shell/simple_socket_stream_bridge.cc
+++ b/webkit/support/simple_socket_stream_bridge.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <vector>
+#include "webkit/support/simple_socket_stream_bridge.h"
 
-#include "webkit/tools/test_shell/simple_socket_stream_bridge.h"
+#include <vector>
 
 #include "base/atomicops.h"
 #include "base/bind.h"
@@ -13,8 +13,8 @@
 #include "base/utf_string_conversions.h"
 #include "googleurl/src/gurl.h"
 #include "net/socket_stream/socket_stream_job.h"
-#include "net/websockets/websocket_job.h"
 #include "net/url_request/url_request_context.h"
+#include "net/websockets/websocket_job.h"
 #include "third_party/WebKit/public/platform/WebSocketStreamHandle.h"
 #include "webkit/glue/websocketstreamhandle_bridge.h"
 #include "webkit/glue/websocketstreamhandle_delegate.h"
diff --git a/webkit/tools/test_shell/simple_socket_stream_bridge.h b/webkit/support/simple_socket_stream_bridge.h
index dee2120..a68e3f1 100644
--- a/webkit/tools/test_shell/simple_socket_stream_bridge.h
+++ b/webkit/support/simple_socket_stream_bridge.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_TOOLS_TEST_SHELL_SIMPLE_SOCKET_STREAM_BRIDGE_H_
-#define WEBKIT_TOOLS_TEST_SHELL_SIMPLE_SOCKET_STREAM_BRIDGE_H_
+#ifndef WEBKIT_SUPPORT_SIMPLE_SOCKET_STREAM_BRIDGE_H_
+#define WEBKIT_SUPPORT_SIMPLE_SOCKET_STREAM_BRIDGE_H_
 
 #include "base/basictypes.h"
 
@@ -32,4 +32,4 @@ class SimpleSocketStreamBridge {
   DISALLOW_IMPLICIT_CONSTRUCTORS(SimpleSocketStreamBridge);
 };
 
-#endif  // WEBKIT_TOOLS_TEST_SHELL_SIMPLE_SOCKET_STREAM_BRIDGE_H_
+#endif  // WEBKIT_SUPPORT_SIMPLE_SOCKET_STREAM_BRIDGE_H_
diff --git a/webkit/tools/test_shell/simple_webcookiejar_impl.cc b/webkit/support/simple_webcookiejar_impl.cc
index 8636404..771d6f4 100644
--- a/webkit/tools/test_shell/simple_webcookiejar_impl.cc
+++ b/webkit/support/simple_webcookiejar_impl.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/tools/test_shell/simple_webcookiejar_impl.h"
+#include "webkit/support/simple_webcookiejar_impl.h"
 
 #include "third_party/WebKit/public/platform/WebURL.h"
-#include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
+#include "webkit/support/simple_resource_loader_bridge.h"
 
 using WebKit::WebString;
 using WebKit::WebURL;
diff --git a/webkit/tools/test_shell/simple_webcookiejar_impl.h b/webkit/support/simple_webcookiejar_impl.h
index 93ea5b5..cb89d03 100644
--- a/webkit/tools/test_shell/simple_webcookiejar_impl.h
+++ b/webkit/support/simple_webcookiejar_impl.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_TOOLS_TEST_SHELL_SIMPLE_WEBCOOKIEJAR_IMPL_H_
-#define WEBKIT_TOOLS_TEST_SHELL_SIMPLE_WEBCOOKIEJAR_IMPL_H_
+#ifndef WEBKIT_SUPPORT_SIMPLE_WEBCOOKIEJAR_IMPL_H_
+#define WEBKIT_SUPPORT_SIMPLE_WEBCOOKIEJAR_IMPL_H_
 
 // TODO(darin): WebCookieJar.h is missing a WebString.h include!
 #include "third_party/WebKit/public/platform/WebCookieJar.h"
@@ -19,4 +19,4 @@ class SimpleWebCookieJarImpl : public WebKit::WebCookieJar {
       const WebKit::WebURL& url, const WebKit::WebURL& first_party_for_cookies);
 };
 
-#endif  // WEBKIT_TOOLS_TEST_SHELL_SIMPLE_WEBCOOKIEJAR_IMPL_H_
+#endif  // WEBKIT_SUPPORT_SIMPLE_WEBCOOKIEJAR_IMPL_H_
diff --git a/webkit/tools/test_shell/test_shell_dummy.cc b/webkit/support/test_shell_dummy.cc
index e1a88a9..e1a88a9 100644
--- a/webkit/tools/test_shell/test_shell_dummy.cc
+++ b/webkit/support/test_shell_dummy.cc
diff --git a/webkit/tools/test_shell/test_shell_request_context.cc b/webkit/support/test_shell_request_context.cc
index bc36f69..b7eadfc 100644
--- a/webkit/tools/test_shell/test_shell_request_context.cc
+++ b/webkit/support/test_shell_request_context.cc
@@ -2,14 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/tools/test_shell/test_shell_request_context.h"
-
-#include "build/build_config.h"
+#include "webkit/support/test_shell_request_context.h"
 
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/worker_pool.h"
+#include "build/build_config.h"
 #include "net/base/cache_type.h"
 #include "net/cert/cert_verifier.h"
 #include "net/cookies/cookie_monster.h"
@@ -34,8 +33,8 @@
 #include "webkit/browser/fileapi/file_system_context.h"
 #include "webkit/browser/fileapi/file_system_url_request_job_factory.h"
 #include "webkit/common/user_agent/user_agent.h"
-#include "webkit/tools/test_shell/simple_file_system.h"
-#include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
+#include "webkit/support/simple_file_system.h"
+#include "webkit/support/simple_resource_loader_bridge.h"
 
 class TestShellHttpUserAgentSettings : public net::HttpUserAgentSettings {
  public:
diff --git a/webkit/tools/test_shell/test_shell_request_context.h b/webkit/support/test_shell_request_context.h
index bcd59e4..40d36f5 100644
--- a/webkit/tools/test_shell/test_shell_request_context.h
+++ b/webkit/support/test_shell_request_context.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_REQUEST_CONTEXT_H_
-#define WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_REQUEST_CONTEXT_H_
+#ifndef WEBKIT_SUPPORT_TEST_SHELL_REQUEST_CONTEXT_H_
+#define WEBKIT_SUPPORT_TEST_SHELL_REQUEST_CONTEXT_H_
 
 #include "base/threading/thread.h"
 #include "net/http/http_cache.h"
@@ -53,4 +53,4 @@ class TestShellRequestContext : public net::URLRequestContext {
   scoped_refptr<fileapi::FileSystemContext> file_system_context_;
 };
 
-#endif  // WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_REQUEST_CONTEXT_H_
+#endif  // WEBKIT_SUPPORT_TEST_SHELL_REQUEST_CONTEXT_H_
diff --git a/webkit/tools/test_shell/test_shell_webblobregistry_impl.cc b/webkit/support/test_shell_webblobregistry_impl.cc
index 3374dac..68fa71c 100644
--- a/webkit/tools/test_shell/test_shell_webblobregistry_impl.cc
+++ b/webkit/support/test_shell_webblobregistry_impl.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/tools/test_shell/test_shell_webblobregistry_impl.h"
+#include "webkit/support/test_shell_webblobregistry_impl.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
diff --git a/webkit/tools/test_shell/test_shell_webblobregistry_impl.h b/webkit/support/test_shell_webblobregistry_impl.h
index 1eaf395..278ee1c 100644
--- a/webkit/tools/test_shell/test_shell_webblobregistry_impl.h
+++ b/webkit/support/test_shell_webblobregistry_impl.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_WEBBLOBREGISTRY_IMPL_H_
-#define WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_WEBBLOBREGISTRY_IMPL_H_
+#ifndef WEBKIT_SUPPORT_TEST_SHELL_WEBBLOBREGISTRY_IMPL_H_
+#define WEBKIT_SUPPORT_TEST_SHELL_WEBBLOBREGISTRY_IMPL_H_
 
 #include "base/memory/ref_counted.h"
 #include "third_party/WebKit/public/platform/WebBlobRegistry.h"
@@ -46,4 +46,4 @@ class TestShellWebBlobRegistryImpl
   DISALLOW_COPY_AND_ASSIGN(TestShellWebBlobRegistryImpl);
 };
 
-#endif  // WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_WEBBLOBREGISTRY_IMPL_H_
+#endif  // WEBKIT_SUPPORT_TEST_SHELL_WEBBLOBREGISTRY_IMPL_H_
diff --git a/webkit/tools/test_shell/test_shell_webmimeregistry_impl.cc b/webkit/support/test_shell_webmimeregistry_impl.cc
index 06a880b..eab4b25 100644
--- a/webkit/tools/test_shell/test_shell_webmimeregistry_impl.cc
+++ b/webkit/support/test_shell_webmimeregistry_impl.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/tools/test_shell/test_shell_webmimeregistry_impl.h"
+#include "webkit/support/test_shell_webmimeregistry_impl.h"
 
 #include "base/basictypes.h"
 #include "base/string_util.h"
diff --git a/webkit/tools/test_shell/test_shell_webmimeregistry_impl.h b/webkit/support/test_shell_webmimeregistry_impl.h
index 6fcff259..b6e876d 100644
--- a/webkit/tools/test_shell/test_shell_webmimeregistry_impl.h
+++ b/webkit/support/test_shell_webmimeregistry_impl.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_WEBMIMEREGISTRY_IMPL_H_
-#define WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_WEBMIMEREGISTRY_IMPL_H_
+#ifndef WEBKIT_SUPPORT_TEST_SHELL_WEBMIMEREGISTRY_IMPL_H_
+#define WEBKIT_SUPPORT_TEST_SHELL_WEBMIMEREGISTRY_IMPL_H_
 
 #include <string>
 #include <vector>
@@ -42,4 +42,4 @@ class TestShellWebMimeRegistryImpl
   DISALLOW_COPY_AND_ASSIGN(TestShellWebMimeRegistryImpl);
 };
 
-#endif  // WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_WEBMIMEREGISTRY_IMPL_H_
+#endif  // WEBKIT_SUPPORT_TEST_SHELL_WEBMIMEREGISTRY_IMPL_H_
diff --git a/webkit/support/test_webkit_platform_support.cc b/webkit/support/test_webkit_platform_support.cc
index 764ec9d..3f7e715 100644
--- a/webkit/support/test_webkit_platform_support.cc
+++ b/webkit/support/test_webkit_platform_support.cc
@@ -43,21 +43,21 @@
 #include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/renderer/compositor_bindings/web_compositor_support_impl.h"
 #include "webkit/support/gc_extension.h"
+#include "webkit/support/mock_webclipboard_impl.h"
+#include "webkit/support/simple_appcache_system.h"
 #include "webkit/support/simple_database_system.h"
+#include "webkit/support/simple_file_system.h"
+#include "webkit/support/simple_resource_loader_bridge.h"
+#include "webkit/support/simple_socket_stream_bridge.h"
+#include "webkit/support/simple_webcookiejar_impl.h"
+#include "webkit/support/test_shell_request_context.h"
+#include "webkit/support/test_shell_webblobregistry_impl.h"
 #include "webkit/support/test_webmessageportchannel.h"
 #include "webkit/support/web_audio_device_mock.h"
 #include "webkit/support/web_gesture_curve_mock.h"
 #include "webkit/support/web_layer_tree_view_impl_for_testing.h"
 #include "webkit/support/webkit_support.h"
 #include "webkit/support/weburl_loader_mock_factory.h"
-#include "webkit/tools/test_shell/mock_webclipboard_impl.h"
-#include "webkit/tools/test_shell/simple_appcache_system.h"
-#include "webkit/tools/test_shell/simple_file_system.h"
-#include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
-#include "webkit/tools/test_shell/simple_socket_stream_bridge.h"
-#include "webkit/tools/test_shell/simple_webcookiejar_impl.h"
-#include "webkit/tools/test_shell/test_shell_request_context.h"
-#include "webkit/tools/test_shell/test_shell_webblobregistry_impl.h"
 
 #if defined(OS_WIN)
 #include "third_party/WebKit/public/platform/win/WebThemeEngine.h"
diff --git a/webkit/support/test_webkit_platform_support.h b/webkit/support/test_webkit_platform_support.h
index adc02c4..1a85dfa 100644
--- a/webkit/support/test_webkit_platform_support.h
+++ b/webkit/support/test_webkit_platform_support.h
@@ -13,14 +13,14 @@
 #include "webkit/glue/webkitplatformsupport_impl.h"
 #include "webkit/mocks/mock_webhyphenator.h"
 #include "webkit/renderer/compositor_bindings/web_compositor_support_impl.h"
+#include "webkit/support/mock_webclipboard_impl.h"
+#include "webkit/support/simple_appcache_system.h"
 #include "webkit/support/simple_database_system.h"
+#include "webkit/support/simple_dom_storage_system.h"
+#include "webkit/support/simple_file_system.h"
+#include "webkit/support/simple_webcookiejar_impl.h"
+#include "webkit/support/test_shell_webmimeregistry_impl.h"
 #include "webkit/support/weburl_loader_mock_factory.h"
-#include "webkit/tools/test_shell/mock_webclipboard_impl.h"
-#include "webkit/tools/test_shell/simple_appcache_system.h"
-#include "webkit/tools/test_shell/simple_dom_storage_system.h"
-#include "webkit/tools/test_shell/simple_file_system.h"
-#include "webkit/tools/test_shell/simple_webcookiejar_impl.h"
-#include "webkit/tools/test_shell/test_shell_webmimeregistry_impl.h"
 
 class TestShellWebBlobRegistryImpl;
 
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
index 7de92db..6d05915 100644
--- a/webkit/support/webkit_support.cc
+++ b/webkit/support/webkit_support.cc
@@ -71,15 +71,15 @@
 #include "webkit/plugins/webplugininfo.h"
 #include "webkit/renderer/compositor_bindings/web_compositor_support_impl.h"
 #include "webkit/support/platform_support.h"
+#include "webkit/support/simple_appcache_system.h"
 #include "webkit/support/simple_database_system.h"
+#include "webkit/support/simple_dom_storage_system.h"
+#include "webkit/support/simple_file_system.h"
+#include "webkit/support/simple_resource_loader_bridge.h"
 #include "webkit/support/test_webidbfactory.h"
 #include "webkit/support/test_webkit_platform_support.h"
 #include "webkit/support/test_webplugin_page_delegate.h"
 #include "webkit/support/web_layer_tree_view_impl_for_testing.h"
-#include "webkit/tools/test_shell/simple_appcache_system.h"
-#include "webkit/tools/test_shell/simple_dom_storage_system.h"
-#include "webkit/tools/test_shell/simple_file_system.h"
-#include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
 
 #if defined(OS_ANDROID)
 #include "base/test/test_support_android.h"
diff --git a/webkit/support/webkit_support.gypi b/webkit/support/webkit_support.gypi
index 9a6b9f70..7e84124 100644
--- a/webkit/support/webkit_support.gypi
+++ b/webkit/support/webkit_support.gypi
@@ -129,31 +129,31 @@
         '<(DEPTH)/webkit/browser/fileapi/mock_file_system_options.h',
         '<(DEPTH)/webkit/browser/quota/mock_special_storage_policy.cc',
         '<(DEPTH)/webkit/browser/quota/mock_special_storage_policy.h',
-        '<(DEPTH)/webkit/tools/test_shell/mac/DumpRenderTreePasteboard.h',
-        '<(DEPTH)/webkit/tools/test_shell/mac/DumpRenderTreePasteboard.m',
-        '<(DEPTH)/webkit/tools/test_shell/mock_webclipboard_impl.cc',
-        '<(DEPTH)/webkit/tools/test_shell/mock_webclipboard_impl.h',
-        '<(DEPTH)/webkit/tools/test_shell/simple_appcache_system.cc',
-        '<(DEPTH)/webkit/tools/test_shell/simple_appcache_system.h',
-        '<(DEPTH)/webkit/tools/test_shell/simple_clipboard_impl.cc',
-        '<(DEPTH)/webkit/tools/test_shell/simple_dom_storage_system.cc',
-        '<(DEPTH)/webkit/tools/test_shell/simple_dom_storage_system.h',
-        '<(DEPTH)/webkit/tools/test_shell/simple_file_system.cc',
-        '<(DEPTH)/webkit/tools/test_shell/simple_file_system.h',
-        '<(DEPTH)/webkit/tools/test_shell/simple_file_writer.cc',
-        '<(DEPTH)/webkit/tools/test_shell/simple_file_writer.h',
-        '<(DEPTH)/webkit/tools/test_shell/simple_resource_loader_bridge.cc',
-        '<(DEPTH)/webkit/tools/test_shell/simple_resource_loader_bridge.h',
-        '<(DEPTH)/webkit/tools/test_shell/simple_socket_stream_bridge.cc',
-        '<(DEPTH)/webkit/tools/test_shell/simple_socket_stream_bridge.h',
-        '<(DEPTH)/webkit/tools/test_shell/simple_webcookiejar_impl.cc',
-        '<(DEPTH)/webkit/tools/test_shell/simple_webcookiejar_impl.h',
-        '<(DEPTH)/webkit/tools/test_shell/test_shell_request_context.cc',
-        '<(DEPTH)/webkit/tools/test_shell/test_shell_request_context.h',
-        '<(DEPTH)/webkit/tools/test_shell/test_shell_webblobregistry_impl.cc',
-        '<(DEPTH)/webkit/tools/test_shell/test_shell_webblobregistry_impl.h',
-        '<(DEPTH)/webkit/tools/test_shell/test_shell_webmimeregistry_impl.cc',
-        '<(DEPTH)/webkit/tools/test_shell/test_shell_webmimeregistry_impl.h',
+        '<(DEPTH)/webkit/support/mac/DumpRenderTreePasteboard.h',
+        '<(DEPTH)/webkit/support/mac/DumpRenderTreePasteboard.m',
+        '<(DEPTH)/webkit/support/mock_webclipboard_impl.cc',
+        '<(DEPTH)/webkit/support/mock_webclipboard_impl.h',
+        '<(DEPTH)/webkit/support/simple_appcache_system.cc',
+        '<(DEPTH)/webkit/support/simple_appcache_system.h',
+        '<(DEPTH)/webkit/support/simple_clipboard_impl.cc',
+        '<(DEPTH)/webkit/support/simple_dom_storage_system.cc',
+        '<(DEPTH)/webkit/support/simple_dom_storage_system.h',
+        '<(DEPTH)/webkit/support/simple_file_system.cc',
+        '<(DEPTH)/webkit/support/simple_file_system.h',
+        '<(DEPTH)/webkit/support/simple_file_writer.cc',
+        '<(DEPTH)/webkit/support/simple_file_writer.h',
+        '<(DEPTH)/webkit/support/simple_resource_loader_bridge.cc',
+        '<(DEPTH)/webkit/support/simple_resource_loader_bridge.h',
+        '<(DEPTH)/webkit/support/simple_socket_stream_bridge.cc',
+        '<(DEPTH)/webkit/support/simple_socket_stream_bridge.h',
+        '<(DEPTH)/webkit/support/simple_webcookiejar_impl.cc',
+        '<(DEPTH)/webkit/support/simple_webcookiejar_impl.h',
+        '<(DEPTH)/webkit/support/test_shell_request_context.cc',
+        '<(DEPTH)/webkit/support/test_shell_request_context.h',
+        '<(DEPTH)/webkit/support/test_shell_webblobregistry_impl.cc',
+        '<(DEPTH)/webkit/support/test_shell_webblobregistry_impl.h',
+        '<(DEPTH)/webkit/support/test_shell_webmimeregistry_impl.cc',
+        '<(DEPTH)/webkit/support/test_shell_webmimeregistry_impl.h',
         '<(DEPTH)/webkit/mocks/mock_webhyphenator.cc',
         '<(DEPTH)/webkit/mocks/mock_webhyphenator.h',
         '<(DEPTH)/webkit/mocks/test_media_stream_client.cc',
diff --git a/webkit/tools/test_shell/DEPS b/webkit/tools/test_shell/DEPS
deleted file mode 100644
index 40948f2..0000000
--- a/webkit/tools/test_shell/DEPS
+++ /dev/null
@@ -1,7 +0,0 @@
-include_rules = [
-  "+breakpad",
-  "+mac",
-  "+third_party/zlib",
-  "+ui",
-  "+webkit/support"
-]
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi
deleted file mode 100644
index 0c8e3d3..0000000
--- a/webkit/tools/test_shell/test_shell.gypi
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright (c) 2012 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.
-
-{
-  'targets': [
-    {
-      'target_name': 'pull_in_copy_TestNetscapePlugIn',
-      'type': 'none',
-      'dependencies': [
-        '../third_party/WebKit/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:copy_TestNetscapePlugIn'
-      ],
-    },
-    {
-      # TODO(tony): This should be moved to webkit_glue.gypi or
-      # webkit_tests.gypi and named something like test_mock_plugin_list.
-      'target_name': 'test_shell_test_support',
-      'type': 'static_library',
-      'dependencies': [
-        '<(DEPTH)/webkit/support/webkit_support.gyp:glue'
-      ],
-      'sources': [
-        '../../plugins/npapi/mock_plugin_list.cc',
-        '../../plugins/npapi/mock_plugin_list.h',
-      ]
-    },
-  ],
-  'conditions': [
-    # Currently test_shell compiles only on Windows, Mac, and Gtk.
-    ['OS=="win" or OS=="mac" or toolkit_uses_gtk==1', {
-      'targets': [
-        {
-          # TODO(darin): Delete this dummy target once the build masters stop
-          # trying to build it.
-          'target_name': 'test_shell',
-          'type': 'static_library',
-          'sources': [
-            'test_shell_dummy.cc',
-          ],
-        },
-      ], 
-    }],
-    ['OS!="android" and OS!="ios"', {
-      # npapi test plugin doesn't build on android or ios
-      'targets': [
-        {
-          'target_name': 'npapi_test_common',
-          'type': 'static_library',
-          'dependencies': [
-            '<(DEPTH)/base/base.gyp:base',
-            '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
-          ],
-          'sources': [
-            '../../plugins/npapi/test/npapi_constants.cc',
-            '../../plugins/npapi/test/npapi_constants.h',
-            '../../plugins/npapi/test/plugin_client.cc',
-            '../../plugins/npapi/test/plugin_client.h',
-            '../../plugins/npapi/test/plugin_test.cc',
-            '../../plugins/npapi/test/plugin_test.h',
-            '../../plugins/npapi/test/plugin_test_factory.h',
-          ],
-          'export_dependent_settings': [
-            '<(DEPTH)/base/base.gyp:base',
-          ],
-        },
-        {
-          'target_name': 'npapi_test_plugin',
-          'type': 'loadable_module',
-          'variables': {
-            'chromium_code': 1,
-          },
-          'mac_bundle': 1,
-          'dependencies': [
-            '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
-            'npapi_test_common',
-          ],
-          'sources': [
-            '../../plugins/npapi/test/npapi_test.cc',
-            '../../plugins/npapi/test/npapi_test.def',
-            '../../plugins/npapi/test/npapi_test.rc',
-            '../../plugins/npapi/test/plugin_arguments_test.cc',
-            '../../plugins/npapi/test/plugin_arguments_test.h',
-            '../../plugins/npapi/test/plugin_create_instance_in_paint.cc',
-            '../../plugins/npapi/test/plugin_create_instance_in_paint.h',
-            '../../plugins/npapi/test/plugin_delete_plugin_in_deallocate_test.cc',
-            '../../plugins/npapi/test/plugin_delete_plugin_in_deallocate_test.h',
-            '../../plugins/npapi/test/plugin_delete_plugin_in_stream_test.cc',
-            '../../plugins/npapi/test/plugin_delete_plugin_in_stream_test.h',
-            '../../plugins/npapi/test/plugin_execute_stream_javascript.cc',
-            '../../plugins/npapi/test/plugin_execute_stream_javascript.h',
-            '../../plugins/npapi/test/plugin_get_javascript_url_test.cc',
-            '../../plugins/npapi/test/plugin_get_javascript_url_test.h',
-            '../../plugins/npapi/test/plugin_get_javascript_url2_test.cc',
-            '../../plugins/npapi/test/plugin_get_javascript_url2_test.h',
-            '../../plugins/npapi/test/plugin_geturl_test.cc',
-            '../../plugins/npapi/test/plugin_geturl_test.h',
-            '../../plugins/npapi/test/plugin_javascript_open_popup.cc',
-            '../../plugins/npapi/test/plugin_javascript_open_popup.h',
-            '../../plugins/npapi/test/plugin_new_fails_test.cc',
-            '../../plugins/npapi/test/plugin_new_fails_test.h',
-            '../../plugins/npapi/test/plugin_npobject_identity_test.cc',
-            '../../plugins/npapi/test/plugin_npobject_identity_test.h',
-            '../../plugins/npapi/test/plugin_npobject_lifetime_test.cc',
-            '../../plugins/npapi/test/plugin_npobject_lifetime_test.h',
-            '../../plugins/npapi/test/plugin_npobject_proxy_test.cc',
-            '../../plugins/npapi/test/plugin_npobject_proxy_test.h',
-            '../../plugins/npapi/test/plugin_schedule_timer_test.cc',
-            '../../plugins/npapi/test/plugin_schedule_timer_test.h',
-            '../../plugins/npapi/test/plugin_setup_test.cc',
-            '../../plugins/npapi/test/plugin_setup_test.h',
-            '../../plugins/npapi/test/plugin_thread_async_call_test.cc',
-            '../../plugins/npapi/test/plugin_thread_async_call_test.h',
-            '../../plugins/npapi/test/plugin_windowed_test.cc',
-            '../../plugins/npapi/test/plugin_windowed_test.h',
-            '../../plugins/npapi/test/plugin_private_test.cc',
-            '../../plugins/npapi/test/plugin_private_test.h',
-            '../../plugins/npapi/test/plugin_test_factory.cc',
-            '../../plugins/npapi/test/plugin_window_size_test.cc',
-            '../../plugins/npapi/test/plugin_window_size_test.h',
-            '../../plugins/npapi/test/plugin_windowless_test.cc',
-            '../../plugins/npapi/test/plugin_windowless_test.h',
-            '../../plugins/npapi/test/resource.h',
-          ],
-          'include_dirs': [
-            '../../..',
-          ],
-          'xcode_settings': {
-            'INFOPLIST_FILE': '<(DEPTH)/webkit/plugins/npapi/test/Info.plist',
-          },
-          'conditions': [
-            ['OS!="win"', {
-              'sources!': [
-                # TODO(port):  Port these.
-                 # plugin_npobject_lifetime_test.cc has win32-isms
-                #   (HWND, CALLBACK).
-                '../../plugins/npapi/test/plugin_npobject_lifetime_test.cc',
-                 # The window APIs are necessarily platform-specific.
-                '../../plugins/npapi/test/plugin_window_size_test.cc',
-                '../../plugins/npapi/test/plugin_windowed_test.cc',
-                 # Seems windows specific.
-                '../../plugins/npapi/test/plugin_create_instance_in_paint.cc',
-                '../../plugins/npapi/test/plugin_create_instance_in_paint.h',
-                 # windows-specific resources
-                '../../plugins/npapi/test/npapi_test.def',
-                '../../plugins/npapi/test/npapi_test.rc',
-              ],
-            }],
-            ['OS=="mac"', {
-              'product_extension': 'plugin',
-              'link_settings': {
-                'libraries': [
-                  '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
-                ],
-              },
-            }],
-            ['os_posix == 1 and OS != "mac" and (target_arch == "x64" or target_arch == "arm")', {
-              # Shared libraries need -fPIC on x86-64
-              'cflags': ['-fPIC']
-            }],
-          ],
-        },
-        {
-          'target_name': 'copy_npapi_test_plugin',
-          'type': 'none',
-          'dependencies': [
-            'npapi_test_plugin',
-          ],
-          'conditions': [
-            ['OS=="win"', {
-              'copies': [
-                {
-                  'destination': '<(PRODUCT_DIR)/plugins',
-                  'files': ['<(PRODUCT_DIR)/npapi_test_plugin.dll'],
-                },
-              ],
-            }],
-            ['OS=="mac"', {
-              'copies': [
-                {
-                  'destination': '<(PRODUCT_DIR)/plugins/',
-                  'files': ['<(PRODUCT_DIR)/npapi_test_plugin.plugin'],
-                },
-              ]
-            }],
-            ['os_posix == 1 and OS != "mac"', {
-              'copies': [
-                {
-                  'destination': '<(PRODUCT_DIR)/plugins',
-                  'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
-                },
-              ],
-            }],
-          ],
-        },
-      ],
-    }],
-  ],
-}
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index 464ff85..8904f31 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -5,7 +5,6 @@
 {
   'includes': [
     '../build/win_precompile.gypi',
-    'tools/test_shell/test_shell.gypi',
   ],
   'variables': {
     'chromium_code': 1,
@@ -25,5 +24,21 @@
         '../third_party/WebKit/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:DumpRenderTree'
       ],
     },
-  ], # targets
+  ],
+  'conditions': [
+    # Currently test_shell compiles only on Windows, Mac, and Gtk.
+    ['OS=="win" or OS=="mac" or toolkit_uses_gtk==1', {
+      'targets': [
+        {
+          # TODO(darin): Delete this dummy target once the build masters stop
+          # trying to build it.
+          'target_name': 'test_shell',
+          'type': 'static_library',
+          'sources': [
+            'support/test_shell_dummy.cc',
+          ],
+        },
+      ],
+    }],
+  ],
 }