summaryrefslogtreecommitdiffstats
path: root/sync/syncable/directory.h
diff options
context:
space:
mode:
authorvkuzkokov <vkuzkokov@chromium.org>2015-04-28 04:27:33 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-28 11:27:36 +0000
commit6d60180f3ca3f9289d37b27e77f90d97db488f7c (patch)
treee0a752fa8fd0a2f9c420a49eb35f5c16f0ce602f /sync/syncable/directory.h
parentb9400dc444da523c1dc1484f8e2adb0637804410 (diff)
downloadchromium_src-6d60180f3ca3f9289d37b27e77f90d97db488f7c.zip
chromium_src-6d60180f3ca3f9289d37b27e77f90d97db488f7c.tar.gz
chromium_src-6d60180f3ca3f9289d37b27e77f90d97db488f7c.tar.bz2
Revert of [Sync] Erase sync DB when corrupted (patchset #4 id:60001 of https://codereview.chromium.org/1082893003/)
Reason for revert: Test fails on Win7 bots. see crbug.com/481895 Original issue's description: > [Sync] Erase sync DB when corrupted > > Directory now registers to be notified of catastrophic sync DB errors. > Upon notification, Directory triggers an unrecoverable sync error which > causes ProfileSyncService to delete the sync DB. > > Add integration test that verifies the sync DB is deleted when DB > corruption is detected. > > Remove unused member variable allow_failure_for_test_ from > DirectoryBackingStore. > > Add MockUnrecoverableErrorHandler to assist in writing tests for > Directory. > > BUG=470993 > > Committed: https://crrev.com/90a7f8d3e3b3a2aac43e71a93eac2731f084945c > Cr-Commit-Position: refs/heads/master@{#327120} TBR=zea@chromium.org,pvalenzuela@chromium.org,maniscalco@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=470993 Review URL: https://codereview.chromium.org/1104423005 Cr-Commit-Position: refs/heads/master@{#327264}
Diffstat (limited to 'sync/syncable/directory.h')
-rw-r--r--sync/syncable/directory.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/sync/syncable/directory.h b/sync/syncable/directory.h
index 4f45cdf..7f6ae0e 100644
--- a/sync/syncable/directory.h
+++ b/sync/syncable/directory.h
@@ -533,7 +533,6 @@ class SYNC_EXPORT Directory {
TakeSnapshotGetsOnlyDirtyHandlesTest);
FRIEND_TEST_ALL_PREFIXES(SyncableDirectoryTest,
TakeSnapshotGetsMetahandlesToPurge);
- FRIEND_TEST_ALL_PREFIXES(SyncableDirectoryTest, CatastrophicError);
// You'll notice that some of the methods below are private overloads of the
// public ones declared above. The general pattern is that the public overload
@@ -623,10 +622,6 @@ class SYNC_EXPORT Directory {
ModelType type,
std::vector<int64>* result);
- // Invoked by DirectoryBackingStore when a catastrophic database error is
- // detected.
- void OnCatastrophicError();
-
// Returns true if the initial sync for |type| has completed.
bool InitialSyncEndedForType(BaseTransaction* trans, ModelType type);
@@ -658,8 +653,6 @@ class SYNC_EXPORT Directory {
// are deleted in native models as well.
scoped_ptr<DeleteJournal> delete_journal_;
- base::WeakPtrFactory<Directory> weak_ptr_factory_;
-
DISALLOW_COPY_AND_ASSIGN(Directory);
};