diff options
| author | vkuzkokov <vkuzkokov@chromium.org> | 2015-04-28 04:27:33 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-28 11:27:36 +0000 |
| commit | 6d60180f3ca3f9289d37b27e77f90d97db488f7c (patch) | |
| tree | e0a752fa8fd0a2f9c420a49eb35f5c16f0ce602f /sync/syncable/on_disk_directory_backing_store.cc | |
| parent | b9400dc444da523c1dc1484f8e2adb0637804410 (diff) | |
| download | chromium_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/on_disk_directory_backing_store.cc')
| -rw-r--r-- | sync/syncable/on_disk_directory_backing_store.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sync/syncable/on_disk_directory_backing_store.cc b/sync/syncable/on_disk_directory_backing_store.cc index 3a37847..918dc07 100644 --- a/sync/syncable/on_disk_directory_backing_store.cc +++ b/sync/syncable/on_disk_directory_backing_store.cc @@ -26,8 +26,9 @@ enum HistogramResultEnum { OnDiskDirectoryBackingStore::OnDiskDirectoryBackingStore( const std::string& dir_name, const base::FilePath& backing_file_path) - : DirectoryBackingStore(dir_name), backing_file_path_(backing_file_path) { - DCHECK(backing_file_path_.IsAbsolute()); + : DirectoryBackingStore(dir_name), + allow_failure_for_test_(false), + backing_file_path_(backing_file_path) { } OnDiskDirectoryBackingStore::~OnDiskDirectoryBackingStore() { |