summaryrefslogtreecommitdiffstats
path: root/sync/sync.gyp
diff options
context:
space:
mode:
authorzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-12 01:32:32 +0000
committerzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-12 01:32:32 +0000
commita91291d00d2b73b9c89ec3ab5266c52e1e354814 (patch)
tree30757feb13ee73fb0374190b38a65ec7f8ba7310 /sync/sync.gyp
parent9775bbe801e247ea60161c2efa270bc854e06b05 (diff)
downloadchromium_src-a91291d00d2b73b9c89ec3ab5266c52e1e354814.zip
chromium_src-a91291d00d2b73b9c89ec3ab5266c52e1e354814.tar.gz
chromium_src-a91291d00d2b73b9c89ec3ab5266c52e1e354814.tar.bz2
Revert "Revert 142517 - [Sync] Refactor sync configuration logic."
Relanding with improved tests and support for cleaning up partial nigori. The original patch was reverted due to users who needed to download a new nigori node, but who had since been migrated. We do not handle migration before the backend is initialized, so we now go ahead and detect+delete partial nigori nodes before redownloading them. By blowing away the old progress marker, we're no longer at risk of receiving the migration done response. In order to test this the SyncBackendHost unit tests have been substantially upgraded. original review at: https://chromiumcodereview.appspot.com/10483015 BUG=129665,133061,133219 TEST=unit/integration tests Review URL: https://chromiumcodereview.appspot.com/10701085 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146262 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/sync.gyp')
-rw-r--r--sync/sync.gyp1
1 files changed, 1 insertions, 0 deletions
diff --git a/sync/sync.gyp b/sync/sync.gyp
index 507f73c0..acc88e5 100644
--- a/sync/sync.gyp
+++ b/sync/sync.gyp
@@ -390,6 +390,7 @@
'sessions/test_util.h',
'syncable/syncable_mock.cc',
'syncable/syncable_mock.h',
+ 'test/callback_counter.h',
'test/engine/fake_model_worker.cc',
'test/engine/fake_model_worker.h',
'test/engine/mock_connection_manager.cc',