Fix incremental linking with unit_tests.

content/content_tests.gypi

 # 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': 'test_support_content',
       'type': 'static_library',
       'defines!': ['CONTENT_IMPLEMENTATION'],
@@ skipping 30 matching lines @@
         'public/test/test_browser_context.h',
         'public/test/test_browser_thread.h',
         'public/test/test_content_client_initializer.h',
         'public/test/test_file_error_injector.h',
         'public/test/test_launcher.h',
         'public/test/test_navigation_observer.h',
         'public/test/test_notification_tracker.h',
         'public/test/test_renderer_host.h',
         'public/test/unittest_test_suite.h',
         'public/test/web_contents_tester.h',
+        'app/startup_helper_win.cc',
         # TODO(phajdan.jr): All of those files should live in content/test (if
         # they're only used by content) or content/public/test (if they're used
         # by other embedders).
         'browser/download/mock_download_file.cc',
         'browser/download/mock_download_file.h',
         'browser/geolocation/arbitrator_dependency_factories_for_test.cc',
         'browser/geolocation/arbitrator_dependency_factories_for_test.h',
         'browser/geolocation/fake_access_token_store.cc',
         'browser/geolocation/fake_access_token_store.h',
         'browser/geolocation/mock_location_provider.cc',
@@ skipping 64 matching lines @@
         'test/web_contents_tester.cc',
 
         # TODO(phajdan.jr): Those files should be moved to webkit
         # test support target.
         '../webkit/appcache/appcache_test_helper.cc',
         '../webkit/appcache/appcache_test_helper.h',
         '../webkit/quota/mock_special_storage_policy.cc',
         '../webkit/quota/mock_special_storage_policy.h',
       ],
       'conditions': [
+        ['OS == "win" or (toolkit_uses_gtk == 1 and selinux == 0)', {
+          'dependencies': [
+            '../sandbox/sandbox.gyp:sandbox',
+          ],
+        }],
         ['enable_webrtc==1', {
           'sources': [
             'renderer/media/mock_media_stream_dependency_factory.cc',
             'renderer/media/mock_media_stream_dependency_factory.h',
             'renderer/media/mock_media_stream_dispatcher.cc',
             'renderer/media/mock_media_stream_dispatcher.h',
             'renderer/media/mock_peer_connection_impl.cc',
             'renderer/media/mock_peer_connection_impl.h',
             'renderer/media/mock_web_peer_connection_00_handler_client.cc',
             'renderer/media/mock_web_peer_connection_00_handler_client.h',
@@ skipping 68 matching lines @@
         '../webkit/support/webkit_support.gyp:dom_storage',
         '../webkit/support/webkit_support.gyp:fileapi',
         '../webkit/support/webkit_support.gyp:glue',
         '../webkit/support/webkit_support.gyp:quota',
         '../webkit/support/webkit_support.gyp:webkit_media',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
-        'app/startup_helper_win.cc',
         'browser/accessibility/browser_accessibility_mac_unittest.mm',
         'browser/accessibility/browser_accessibility_manager_unittest.cc',
         'browser/accessibility/browser_accessibility_win_unittest.cc',
         'browser/appcache/chrome_appcache_service_unittest.cc',
         'browser/browser_thread_unittest.cc',
         'browser/browser_url_handler_impl_unittest.cc',
         'browser/child_process_security_policy_unittest.cc',
         'browser/debugger/devtools_manager_unittest.cc',
         'browser/device_orientation/provider_unittest.cc',
         'browser/download/base_file_unittest.cc',
@@ skipping 229 matching lines @@
         ['OS=="mac"', {
           # These flags are needed to run the test on Mac.
           # Search for comments about "xcode_settings" in chrome_tests.gypi.
           'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
         }],
         ['chromeos==1', {
           'sources/': [
             ['exclude', '^browser/renderer_host/gtk_key_bindings_handler_unittest.cc'],
           ],
         }],
-        ['OS == "win" or (toolkit_uses_gtk == 1 and selinux == 0)', {
-          'dependencies': [
-            '../sandbox/sandbox.gyp:sandbox',
-          ],
-        }],
         ['use_aura==1', {
           'dependencies': [
             '../ui/aura/aura.gyp:aura',
           ],
           'sources!': [
             'browser/accessibility/browser_accessibility_win_unittest.cc',
           ],
         }],
         ['OS == "android"', {
           'sources!': [
@@ skipping 28 matching lines @@
         '../ui/ui.gyp:ui',
         '../webkit/support/webkit_support.gyp:glue',
       ],
       'include_dirs': [
         '..',
       ],
       'defines': [
         'HAS_OUT_OF_PROC_TEST_RUNNER',
       ],
       'sources': [
-        'app/startup_helper_win.cc',
-        'public/test/test_launcher.h',
         'test/content_browser_test.h',
         'test/content_browser_test.cc',
         'test/content_test_launcher.cc',
       ],
       'conditions': [
         ['OS=="win"', {
           'resource_include_dirs': [
             '<(SHARED_INTERMEDIATE_DIR)/webkit',
           ],
           'sources': [
@@ skipping 22 matching lines @@
                 },
               },
             },
           },
         }],
         ['OS=="win" and win_use_allocator_shim==1', {
           'dependencies': [
             '../base/allocator/allocator.gyp:allocator',
           ],
         }],
-        ['OS == "win" or (toolkit_uses_gtk == 1 and selinux == 0)', {
-          'dependencies': [
-            '../sandbox/sandbox.gyp:sandbox',
-          ],
-        }],
       ],
     },
   ],
   'conditions': [
     ['target_arch=="arm" or OS=="win" or OS=="mac"', {
       'targets': [
         {
           'conditions': [
             ['target_arch=="arm"', {
               'target_name': 'omx_video_decode_accelerator_unittest',
@@ skipping 83 matching lines @@
               '<(PRODUCT_DIR)/lib.java/chromium_base.jar',
               '<(PRODUCT_DIR)/lib.java/chromium_content.jar',
             ],
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }],
   ],
 }