Revert of Split content_shell dependencies for layout tests.

Revert of Split content_shell dependencies for layout tests. (https://codereview.chromium.org/221993002/)

Reason for revert:
Speculative rollout due to Linux DEPS builder compilation failure: http://build.chromium.org/p/chromium.webkit/builders/WebKit%20Linux%20%28deps%29/builds/27968

Original issue's description:
> Split content_shell dependencies for layout tests.
> 
> This CL is isolating the minimum dependencies required to make layout
> tests work in content_shell without requiring it to depend on the entire
> test_support_content_target.
> crrev.com/11275277 has introduced a dependency on test_support_content
> to cope with layout test. test_support_content, however, was intended
> for unit/browser-tests and adding its dependency to content_shell
> causes a lot of unnecessary sources to be linked in.
> The linker --gc-sections has hidden the problem so far, but that doesn't
> seem to be an option for arm64 (at least with the current toolchain).
> 
> 
> BUG=159847, 354405
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=261741

TBR=jam@chromium.org,primiano@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=159847, 354405
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=261759

[pfeldman, 2014-04-04 15:22:28]

Created Revert of Split content_shell dependencies for layout tests.

[commit-bot: I haz the power, 2014-04-04 15:23:09]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/pfeldman@chromium.org/226123003/1

[pfeldman, 2014-04-04 15:26:09]

Committed patchset #1 manually as r261759 (tree was closed).

[commit-bot: I haz the power, 2014-04-04 15:30:25]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/pfeldman@chromium.org/226123003/1

[commit-bot: I haz the power, 2014-04-04 15:30:30]

Failed to apply patch for content/content_shell.gypi:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file content/content_shell.gypi
  Hunk #1 FAILED at 38.
  Hunk #2 FAILED at 61.
  Hunk #3 FAILED at 245.
  Hunk #4 succeeded at 298 with fuzz 2 (offset -3 lines).
  Hunk #5 FAILED at 495.
  4 out of 5 hunks FAILED -- saving rejects to file
content/content_shell.gypi.rej

Patch:       content/content_shell.gypi
Index: content/content_shell.gypi
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index
7693c4f4475d6cff3d2dd3f565345e22f72153eb..26813ef76230a24dcbd4a73b238004a6e8c1495e
100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -38,14 +38,11 @@
         'content_resources.gyp:content_resources',
         'content_shell_resources',
         'copy_test_netscape_plugin',
-        'layouttest_support_content',
+        'test_support_content',
         '../base/base.gyp:base',
-        '../base/base.gyp:base_static',
        
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '../cc/cc.gyp:cc',
         '../components/components.gyp:breakpad_component',
         '../gin/gin.gyp:gin',
-        '../gpu/gpu.gyp:gpu',
         '../ipc/ipc.gyp:ipc',
         '../media/media.gyp:media',
         '../net/net.gyp:net',
@@ -61,14 +58,13 @@
         '../url/url.gyp:url_lib',
         '../v8/tools/gyp/v8.gyp:v8',
         '../webkit/common/webkit_common.gyp:webkit_common',
-       
'../webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_bindings',
-        '../webkit/storage_browser.gyp:webkit_storage_browser',
         '../webkit/webkit_resources.gyp:webkit_resources',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
+        'public/test/layouttest_support.h',
         'shell/android/shell_jni_registrar.cc',
         'shell/android/shell_jni_registrar.h',
         'shell/android/shell_manager.cc',
@@ -245,6 +241,7 @@
         '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': {
@@ -301,6 +298,12 @@
           ],
           'dependencies!': [
             'copy_test_netscape_plugin',
+          ],
+        }, {  # else: OS!="android"
+          'dependencies': [
+            # This dependency is for running DRT against the content shell, and
+            # this combination is not yet supported on Android.
+            'test_support_content',
           ],
         }],  # OS=="android"
         ['os_posix == 1 and OS != "mac" and android_webview_build != 1', {
@@ -489,11 +492,7 @@
             ],
             'conditions': [
               ['OS!="android"', {
-                'variables': {
-                  'pak_inputs': [
-                    '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',
-                  ],
-                },
+                'pak_inputs':
['<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',],
                 'pak_output': '<(PRODUCT_DIR)/content_shell.pak',
               }, {
                 'pak_output':
'<(PRODUCT_DIR)/content_shell/assets/content_shell.pak',

[Primiano Tucci (use gerrit), 2014-04-04 15:32:22]

On 2014/04/04 15:30:30, I haz the power (commit-bot) wrote:
> Failed to apply patch for content/content_shell.gypi:
> While running patch -p1 --forward --force --no-backup-if-mismatch;
>   patching file content/content_shell.gypi
>   Hunk #1 FAILED at 38.
>   Hunk #2 FAILED at 61.
>   Hunk #3 FAILED at 245.
>   Hunk #4 succeeded at 298 with fuzz 2 (offset -3 lines).
>   Hunk #5 FAILED at 495.
>   4 out of 5 hunks FAILED -- saving rejects to file
> content/content_shell.gypi.rej
> 
> Patch:       content/content_shell.gypi
> Index: content/content_shell.gypi
> diff --git a/content/content_shell.gypi b/content/content_shell.gypi
> index
>
7693c4f4475d6cff3d2dd3f565345e22f72153eb..26813ef76230a24dcbd4a73b238004a6e8c1495e
> 100644
> --- a/content/content_shell.gypi
> +++ b/content/content_shell.gypi
> @@ -38,14 +38,11 @@
>          'content_resources.gyp:content_resources',
>          'content_shell_resources',
>          'copy_test_netscape_plugin',
> -        'layouttest_support_content',
> +        'test_support_content',
>          '../base/base.gyp:base',
> -        '../base/base.gyp:base_static',
>         
>
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
> -        '../cc/cc.gyp:cc',
>          '../components/components.gyp:breakpad_component',
>          '../gin/gin.gyp:gin',
> -        '../gpu/gpu.gyp:gpu',
>          '../ipc/ipc.gyp:ipc',
>          '../media/media.gyp:media',
>          '../net/net.gyp:net',
> @@ -61,14 +58,13 @@
>          '../url/url.gyp:url_lib',
>          '../v8/tools/gyp/v8.gyp:v8',
>          '../webkit/common/webkit_common.gyp:webkit_common',
> -       
>
'../webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_bindings',
> -        '../webkit/storage_browser.gyp:webkit_storage_browser',
>          '../webkit/webkit_resources.gyp:webkit_resources',
>        ],
>        'include_dirs': [
>          '..',
>        ],
>        'sources': [
> +        'public/test/layouttest_support.h',
>          'shell/android/shell_jni_registrar.cc',
>          'shell/android/shell_jni_registrar.h',
>          'shell/android/shell_manager.cc',
> @@ -245,6 +241,7 @@
>          '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': {
> @@ -301,6 +298,12 @@
>            ],
>            'dependencies!': [
>              'copy_test_netscape_plugin',
> +          ],
> +        }, {  # else: OS!="android"
> +          'dependencies': [
> +            # This dependency is for running DRT against the content shell,
and
> +            # this combination is not yet supported on Android.
> +            'test_support_content',
>            ],
>          }],  # OS=="android"
>          ['os_posix == 1 and OS != "mac" and android_webview_build != 1', {
> @@ -489,11 +492,7 @@
>              ],
>              'conditions': [
>                ['OS!="android"', {
> -                'variables': {
> -                  'pak_inputs': [
> -                   
'<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',
> -                  ],
> -                },
> +                'pak_inputs':
> ['<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',],
>                  'pak_output': '<(PRODUCT_DIR)/content_shell.pak',
>                }, {
>                  'pak_output':
> '<(PRODUCT_DIR)/content_shell/assets/content_shell.pak',

I am not sure my CL was related. Will retry

[pfeldman, 2014-04-04 16:02:38]

It was indeed a problematic change, see the new build logs:

with original change applied:
http://build.chromium.org/p/chromium.webkit/builders/WebKit%20Linux%20%28deps...
with original change reverted:
http://build.chromium.org/p/chromium.webkit/builders/WebKit%20Linux%20%28deps...