Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1814)

Unified Diff: chrome/chrome_tests.gypi

Issue 10647008: Fix incremental linking with unit_tests. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix mac Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/test/gpu/test_support_gpu.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests.gypi
===================================================================
--- chrome/chrome_tests.gypi (revision 143598)
+++ chrome/chrome_tests.gypi (working copy)
@@ -511,7 +511,6 @@
'test/base/chrome_test_launcher.cc',
'test/base/view_event_test_base.cc',
'test/base/view_event_test_base.h',
- '../content/app/startup_helper_win.cc',
'../content/browser/mouseleave_browsertest.cc',
],
'conditions': [
@@ -605,7 +604,6 @@
],
'dependencies': [
'chrome.gyp:chrome_version_resources',
- '../sandbox/sandbox.gyp:sandbox',
'../third_party/isimpledom/isimpledom.gyp:isimpledom',
'../ui/ui.gyp:ui_resources',
'../ui/ui.gyp:ui_resources_standard',
@@ -2998,7 +2996,6 @@
# TODO(craig): Rename this and run from base_unittests when the test
# is safe to run there. See http://crbug.com/78722 for details.
'../base/files/file_path_watcher_browsertest.cc',
- '../content/app/startup_helper_win.cc',
'../content/browser/accessibility/cross_platform_accessibility_browsertest.cc',
'../content/browser/accessibility/dump_accessibility_tree_browsertest.cc',
'../content/browser/accessibility/dump_accessibility_tree_helper.cc',
@@ -3199,7 +3196,6 @@
'dependencies': [
'chrome_version_resources',
'security_tests', # run time dependency
- '../sandbox/sandbox.gyp:sandbox',
],
'conditions': [
['win_use_allocator_shim==1', {
@@ -3417,7 +3413,6 @@
'test/perf/browser_perf_test.h',
'test/perf/rendering/latency_tests.cc',
'test/perf/rendering/throughput_tests.cc',
- '../content/app/startup_helper_win.cc',
],
'rules': [
{
@@ -3468,7 +3463,6 @@
],
'dependencies': [
'chrome_version_resources',
- '../sandbox/sandbox.gyp:sandbox',
],
'conditions': [
['win_use_allocator_shim==1', {
@@ -3563,7 +3557,6 @@
'app/chrome_dll.rc',
'browser/safe_browsing/safe_browsing_test.cc',
'test/base/chrome_test_launcher.cc',
- '../content/app/startup_helper_win.cc',
],
'conditions': [
['safe_browsing==0', {
@@ -3574,7 +3567,6 @@
['OS=="win"', {
'dependencies': [
'chrome_version_resources',
- '../sandbox/sandbox.gyp:sandbox',
],
'sources': [
'<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
@@ -3927,7 +3919,6 @@
'browser/sync/test/integration/two_client_typed_urls_sync_test.cc',
'browser/sync/test/integration/typed_urls_helper.cc',
'browser/sync/test/integration/typed_urls_helper.h',
- '../content/app/startup_helper_win.cc',
],
'conditions': [
['toolkit_uses_gtk == 1', {
@@ -3961,7 +3952,6 @@
],
'dependencies': [
'chrome_version_resources',
- '../sandbox/sandbox.gyp:sandbox',
],
'conditions': [
['win_use_allocator_shim==1', {
@@ -4050,7 +4040,6 @@
'browser/sync/test/integration/typed_urls_helper.h',
'test/base/chrome_test_launcher.cc',
'test/data/resource.rc',
- '../content/app/startup_helper_win.cc',
],
'conditions': [
['toolkit_uses_gtk == 1', {
@@ -4084,7 +4073,6 @@
],
'dependencies': [
'chrome_version_resources',
- '../sandbox/sandbox.gyp:sandbox',
],
'conditions': [
['win_use_allocator_shim==1', {
« no previous file with comments | « no previous file | chrome/test/gpu/test_support_gpu.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698