diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-30 08:15:31 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-30 08:15:31 +0000 |
| commit | 82df52ead5f3e27ac2c745b89c3d4e7475d54918 (patch) | |
| tree | 0203f2bcc6ec0d20c24437b763f3aad1bf9ea863 /chrome/chrome_tests.gypi | |
| parent | 228cb40ea43f32a355844adf3ef0602439aeecc3 (diff) | |
| download | chromium_src-82df52ead5f3e27ac2c745b89c3d4e7475d54918.zip chromium_src-82df52ead5f3e27ac2c745b89c3d4e7475d54918.tar.gz chromium_src-82df52ead5f3e27ac2c745b89c3d4e7475d54918.tar.bz2 | |
Revert "[Third time landing] Python implementation of sync server, for testing."
This broke the memory waterfall, failed to import protobuf.
TBR=nick
Review URL: http://codereview.chromium.org/1822001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46048 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_tests.gypi')
| -rw-r--r-- | chrome/chrome_tests.gypi | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 68bbca1..0a9af8d 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -503,13 +503,13 @@ 'msvs_guid': 'ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC', 'dependencies': [ 'browser', - 'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp', 'chrome', 'chrome_resources', 'chrome_strings', 'common', 'debugger', 'renderer', + 'sync_proto', 'test_support_unit', 'utility', '../app/app.gyp:app_base', @@ -1715,7 +1715,6 @@ '_USE_32BIT_TIME_T', ], 'dependencies': [ - 'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp', 'common', 'debugger', '../skia/skia.gyp:skia', @@ -1723,6 +1722,7 @@ '../testing/gtest.gyp:gtest', '../third_party/libjingle/libjingle.gyp:libjingle', 'syncapi', + 'sync_proto', 'test_support_unit', ], 'conditions': [ @@ -1810,14 +1810,15 @@ 'type': 'executable', 'dependencies': [ 'browser', - 'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp', 'chrome', 'chrome_resources', 'common', 'debugger', 'renderer', + 'chrome_resources', 'chrome_strings', - 'test_support_common', + 'sync_proto', + 'test_support_unit', '../net/net.gyp:net_test_support', '../printing/printing.gyp:printing', '../skia/skia.gyp:skia', @@ -1839,9 +1840,6 @@ 'app/chrome_dll_resource.h', 'test/in_process_browser_test.cc', 'test/in_process_browser_test.h', - 'test/test_launcher/out_of_proc_test_runner.cc', - 'test/test_launcher/test_runner.cc', - 'test/test_launcher/test_runner.h', 'test/live_sync/bookmark_model_verifier.cc', 'test/live_sync/bookmark_model_verifier.h', 'test/live_sync/live_sync_test.cc', |