Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(301)

Unified Diff: sync/syncable/deferred_on_disk_directory_backing_store.cc

Issue 1082423002: [Sync] Make DirectoryBackingStore's db_ private. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | sync/syncable/directory_backing_store.h » ('j') | sync/syncable/directory_backing_store.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/syncable/deferred_on_disk_directory_backing_store.cc
diff --git a/sync/syncable/deferred_on_disk_directory_backing_store.cc b/sync/syncable/deferred_on_disk_directory_backing_store.cc
index 3a41fabe7f25eb6fcd46fe3e3564028f2d45bd86..e4f8a1ee8e707fd8fb26d23b7686ed72cb38d56d 100644
--- a/sync/syncable/deferred_on_disk_directory_backing_store.cc
+++ b/sync/syncable/deferred_on_disk_directory_backing_store.cc
@@ -38,7 +38,7 @@ bool DeferredOnDiskDirectoryBackingStore::SaveChanges(
// Reopen DB on disk.
ResetAndCreateConnection();
- if (!db_->Open(backing_filepath_) || !InitializeTables())
+ if (!Open(backing_filepath_) || !InitializeTables())
return false;
db_is_on_disk_ = true;
@@ -54,8 +54,8 @@ DirOpenResult DeferredOnDiskDirectoryBackingStore::Load(
Directory::KernelLoadInfo* kernel_load_info) {
// Open an in-memory database at first to create initial sync data needed by
// Directory.
- CHECK(!db_->is_open());
- if (!db_->OpenInMemory())
+ CHECK(!IsOpen());
+ if (!OpenInMemory())
return FAILED_OPEN_DATABASE;
if (!InitializeTables())
« no previous file with comments | « no previous file | sync/syncable/directory_backing_store.h » ('j') | sync/syncable/directory_backing_store.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698