Split content_shell dependencies for layout tests.

content/content_shell.gypi

Index: content/content_shell.gypi
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 5879e2d58967f8ffad04ee529a92c129e3928a64..452a93e3eaae62567395dfb813b2d4f35c8bcd8b 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -38,7 +38,7 @@
         'content_resources.gyp:content_resources',
         'content_shell_resources',
         'copy_test_netscape_plugin',
-        'test_support_content',
+        'layout_tests_support_content',
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../components/components.gyp:breakpad_component',
@@ -64,7 +64,6 @@
         '..',
       ],
       'sources': [
-        'public/test/layouttest_support.h',
         'shell/android/shell_jni_registrar.cc',
         'shell/android/shell_jni_registrar.h',
         'shell/android/shell_manager.cc',
@@ -112,8 +111,6 @@
         'shell/browser/shell_javascript_dialog_manager.cc',
         'shell/browser/shell_javascript_dialog_manager.h',
         'shell/browser/shell_javascript_dialog_win.cc',
-        'shell/browser/shell_layout_tests_android.cc',
-        'shell/browser/shell_layout_tests_android.h',
         'shell/browser/shell_login_dialog.cc',
         'shell/browser/shell_login_dialog_gtk.cc',
         'shell/browser/shell_login_dialog.h',
@@ -241,7 +238,6 @@
         'shell/renderer/test_runner/web_ax_object_proxy.h',
         'shell/renderer/webkit_test_runner.cc',
         'shell/renderer/webkit_test_runner.h',
-        'test/layouttest_support.cc',
       ],
       'msvs_settings': {
         'VCLinkerTool': {
@@ -965,7 +961,6 @@
           'type': 'none',
           'sources': [
             'shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java',
-            'shell/android/java/src/org/chromium/content_shell/ShellLayoutTestUtils.java',
             'shell/android/java/src/org/chromium/content_shell/ShellManager.java',
             'shell/android/java/src/org/chromium/content_shell/Shell.java',
           ],