diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-19 19:36:34 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-19 19:36:34 +0000 |
| commit | a03c04800033b9400a7fa4559157ef098a5d4721 (patch) | |
| tree | e5e17db7a2858c37d96eb89ab9ca5503e36db222 /chrome/chrome_tests.gypi | |
| parent | 95b7d5ff5805da8d26b83abe41e93a27cfb41bcd (diff) | |
| download | chromium_src-a03c04800033b9400a7fa4559157ef098a5d4721.zip chromium_src-a03c04800033b9400a7fa4559157ef098a5d4721.tar.gz chromium_src-a03c04800033b9400a7fa4559157ef098a5d4721.tar.bz2 | |
Improve the integration test harness by using the max_local_timestamp
from the sync engine rather than waiting for "a couple syncs" to happen
before declaring sync "done".
BUG=37351
Review URL: http://codereview.chromium.org/1042008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42134 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_tests.gypi')
| -rw-r--r-- | chrome/chrome_tests.gypi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 25e7e7c..b00ea71 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1692,6 +1692,7 @@ 'chrome_resources', 'chrome_strings', 'syncapi', + 'sync_proto', 'test_support_unit', '../net/net.gyp:net_test_support', '../printing/printing.gyp:printing', @@ -1706,6 +1707,7 @@ 'include_dirs': [ '..', '<(INTERMEDIATE_DIR)', + '<(protoc_out_dir)', ], # TODO(phajdan.jr): Only temporary, to make transition easier. 'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ], |