summaryrefslogtreecommitdiffstats
path: root/sync/internal_api/test
diff options
context:
space:
mode:
authorhaitaol@chromium.org <haitaol@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-26 03:37:09 +0000
committerhaitaol@chromium.org <haitaol@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-26 03:37:09 +0000
commitdd67d4d2bc64f51837cd7faed95ded8a967e6cd0 (patch)
tree026481c92bad74a37451339814edb05932822c0b /sync/internal_api/test
parent8939915f067628c1fecad626dd506b0d8f2b1a0b (diff)
downloadchromium_src-dd67d4d2bc64f51837cd7faed95ded8a967e6cd0.zip
chromium_src-dd67d4d2bc64f51837cd7faed95ded8a967e6cd0.tar.gz
chromium_src-dd67d4d2bc64f51837cd7faed95ded8a967e6cd0.tar.bz2
Copy entries of broken (having unrecoverable error) data types to delete journals before purging.
BUG=121928 Review URL: https://chromiumcodereview.appspot.com/11578017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179003 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/internal_api/test')
-rw-r--r--sync/internal_api/test/fake_sync_manager.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sync/internal_api/test/fake_sync_manager.cc b/sync/internal_api/test/fake_sync_manager.cc
index 0556cc9..e07c8e7 100644
--- a/sync/internal_api/test/fake_sync_manager.cc
+++ b/sync/internal_api/test/fake_sync_manager.cc
@@ -181,6 +181,7 @@ void FakeSyncManager::StartSyncingNormally(
void FakeSyncManager::ConfigureSyncer(
ConfigureReason reason,
ModelTypeSet types_to_config,
+ ModelTypeSet failed_types,
const ModelSafeRoutingInfo& new_routing_info,
const base::Closure& ready_task,
const base::Closure& retry_task) {
@@ -196,7 +197,7 @@ void FakeSyncManager::ConfigureSyncer(
// Update our fake directory by clearing and fake-downloading as necessary.
UserShare* share = GetUserShare();
- share->directory->PurgeEntriesWithTypeIn(disabled_types);
+ share->directory->PurgeEntriesWithTypeIn(disabled_types, ModelTypeSet());
for (ModelTypeSet::Iterator it = success_types.First(); it.Good(); it.Inc()) {
// We must be careful to not create the same root node twice.
if (!initial_sync_ended_types_.Has(it.Get())) {