OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "sync/test/test_directory_backing_store.h" | 5 #include "sync/test/test_directory_backing_store.h" |
6 | 6 |
7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 | 9 |
10 namespace syncer { | 10 namespace syncer { |
11 namespace syncable { | 11 namespace syncable { |
12 | 12 |
13 TestDirectoryBackingStore::TestDirectoryBackingStore( | 13 TestDirectoryBackingStore::TestDirectoryBackingStore( |
14 const std::string& dir_name, sql::Connection* db) | 14 const std::string& dir_name, sql::Connection* db) |
15 : DirectoryBackingStore(dir_name, db) { | 15 : DirectoryBackingStore(dir_name, db) { |
16 } | 16 } |
17 | 17 |
18 TestDirectoryBackingStore::~TestDirectoryBackingStore() { | 18 TestDirectoryBackingStore::~TestDirectoryBackingStore() { |
19 // This variant of the DirectoryBackingStore does not own its connection, so | 19 // This variant of the DirectoryBackingStore does not own its connection, so |
20 // we take care to not delete it here. | 20 // we take care to not delete it here. |
21 ignore_result(db_.release()); | 21 ignore_result(db_.release()); |
22 } | 22 } |
23 | 23 |
24 DirOpenResult TestDirectoryBackingStore::Load( | 24 DirOpenResult TestDirectoryBackingStore::Load( |
25 MetahandlesIndex* entry_bucket, | 25 MetahandlesIndex* entry_bucket, |
| 26 JournalIndex* delete_journals, |
26 Directory::KernelLoadInfo* kernel_load_info) { | 27 Directory::KernelLoadInfo* kernel_load_info) { |
27 DCHECK(db_->is_open()); | 28 DCHECK(db_->is_open()); |
28 | 29 |
29 if (!InitializeTables()) | 30 if (!InitializeTables()) |
30 return FAILED_OPEN_DATABASE; | 31 return FAILED_OPEN_DATABASE; |
31 | 32 |
32 if (!DropDeletedEntries()) | 33 if (!DropDeletedEntries()) |
33 return FAILED_DATABASE_CORRUPT; | 34 return FAILED_DATABASE_CORRUPT; |
34 if (!LoadEntries(entry_bucket)) | 35 if (!LoadEntries(entry_bucket)) |
35 return FAILED_DATABASE_CORRUPT; | 36 return FAILED_DATABASE_CORRUPT; |
| 37 if (!LoadDeleteJournals(delete_journals)) |
| 38 return FAILED_DATABASE_CORRUPT; |
36 if (!LoadInfo(kernel_load_info)) | 39 if (!LoadInfo(kernel_load_info)) |
37 return FAILED_DATABASE_CORRUPT; | 40 return FAILED_DATABASE_CORRUPT; |
38 if (!VerifyReferenceIntegrity(*entry_bucket)) | 41 if (!VerifyReferenceIntegrity(*entry_bucket)) |
39 return FAILED_DATABASE_CORRUPT; | 42 return FAILED_DATABASE_CORRUPT; |
40 | 43 |
41 return OPENED; | 44 return OPENED; |
42 } | 45 } |
43 | 46 |
44 } // namespace syncable | 47 } // namespace syncable |
45 } // namespace syncer | 48 } // namespace syncer |
OLD | NEW |