Use the all_blink target instead of specifying particular targets inside Blink

build/all.gyp

 # 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': 'All',
       'type': 'none',
       'xcode_create_dependents_test_runner': 1,
@@ skipping 397 matching lines @@
                 '../remoting/remoting.gyp:remoting_host_installation',
               ],
             }],
           ],
         }, # target_name: chromium_builder_qa
         {
           'target_name': 'chromium_builder_perf_av',
           'type': 'none',
           'dependencies': [
             'chromium_builder_qa',  # needed for perf pyauto tests
-            '../content/content.gyp:content_shell',
-            '../webkit/webkit.gyp:pull_in_DumpRenderTree',  # to run layout tests
+            '../third_party/WebKit/public/all.gyp:all_blink', # to run layout tests

[abarth-chromium, 2013/05/28 07:46:18]

This doesn't pull in content_shell, so you might need to keep the content_shell
line.

Maybe you want to depend on the all_webkit target in Chromium-land, which pulls
in blink and content_shell?

[jamesr, 2013/05/28 07:55:09]

Ooh, good call. I had thought all_blink depended on content_shell, but it
definitely doesn't.  Fixed.

           ],
         },  # target_name: chromium_builder_perf_av
         {
           # This target contains everything we need to run tests on the special
           # device-equipped WebRTC bots. We have device-requiring tests in
           # PyAuto, browser_tests and content_browsertests.
           'target_name': 'chromium_builder_webrtc',
           'type': 'none',
           'dependencies': [
             'chromium_builder_qa',  # needed for perf pyauto tests
@@ skipping 117 matching lines @@
             '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
             '../url/url.gyp:googleurl_unittests',
           ],
         },
         {
           'target_name': 'chromium_builder_asan_mac',
           'type': 'none',
           'dependencies': [
             '../chrome/chrome.gyp:chrome',
             '../net/net.gyp:dns_fuzz_stub',
-            '../content/content.gyp:content_shell',
-            '../webkit/webkit.gyp:pull_in_DumpRenderTree',
+            '../third_party/WebKit/public/all.gyp:all_blink',
           ],
         },
         {
           'target_name': 'chromium_builder_dbg_valgrind_mac',
           'type': 'none',
           'dependencies': [
             '../base/base.gyp:base_unittests',
             '../chrome/chrome.gyp:unit_tests',
             '../cloud_print/cloud_print.gyp:cloud_print_unittests',
             '../components/components.gyp:components_unittests',
@@ skipping 136 matching lines @@
             '../sql/sql.gyp:sql_unittests',
             '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
             '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
             '../url/url.gyp:googleurl_unittests',
           ],
         },
         {
           'target_name': 'webkit_builder_win',
           'type': 'none',
           'dependencies': [
-            '../webkit/webkit.gyp:pull_in_webkit_unit_tests',
-            '../content/content.gyp:content_shell',
-            '../webkit/webkit.gyp:pull_in_DumpRenderTree',
+            '../third_party/WebKit/public/all.gyp:all_blink',
           ],
         },
       ],  # targets
       'conditions': [
         ['branding=="Chrome"', {
           'targets': [
             {
               'target_name': 'chrome_official_builder',
               'type': 'none',
               'dependencies': [
@@ skipping 69 matching lines @@
             '../ui/app_list/app_list.gyp:*',
             '../ui/aura/aura.gyp:*',
             '../ui/compositor/compositor.gyp:*',
             '../ui/message_center/message_center.gyp:*',
             '../ui/ui.gyp:ui_unittests',
             '../ui/views/views.gyp:views',
             '../ui/views/views.gyp:views_examples_with_content_exe',
             '../ui/views/views.gyp:views_unittests',
             '../ui/keyboard/keyboard.gyp:*',
             '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests',
-            '../webkit/webkit.gyp:pull_in_webkit_unit_tests',
+            '../third_party/WebKit/public/all.gyp:all_blink',
           ],
           'conditions': [
             ['OS=="win"', {
               'dependencies': [
                 '../chrome/chrome.gyp:crash_service',
                 '../chrome_frame/chrome_frame.gyp:npchrome_frame',
               ],
             }],
             ['OS=="win" and target_arch!="x64"', {
               'dependencies': [
@@ skipping 61 matching lines @@
             '../chrome/chrome.gyp:interactive_ui_tests_run',
             '../chrome/chrome.gyp:sync_integration_tests_run',
             '../chrome/chrome.gyp:unit_tests_run',
             '../net/net.gyp:net_unittests_run',
           ],
         }, # target_name: chromium_swarm_tests
       ],
     }],
   ], # conditions
 }