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

Unified Diff: sync/internal_api/sync_rollback_manager_base.cc

Issue 455023003: Let SyncBackupManager keep backup data in memory until shutdown. Only persist (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix sync manager test Created 6 years, 4 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
Index: sync/internal_api/sync_rollback_manager_base.cc
diff --git a/sync/internal_api/sync_rollback_manager_base.cc b/sync/internal_api/sync_rollback_manager_base.cc
index 67e152bf319e0ba636f6230974314c992fde85f9..a2f14e4b90147cb709c125beb7f0c33328b54b11 100644
--- a/sync/internal_api/sync_rollback_manager_base.cc
+++ b/sync/internal_api/sync_rollback_manager_base.cc
@@ -5,7 +5,6 @@
#include "sync/internal_api/sync_rollback_manager_base.h"
#include "sync/internal_api/public/base/model_type.h"
-#include "sync/internal_api/public/internal_components_factory.h"
#include "sync/internal_api/public/read_node.h"
#include "sync/internal_api/public/read_transaction.h"
#include "sync/internal_api/public/write_transaction.h"
@@ -53,12 +52,13 @@ SyncRollbackManagerBase::~SyncRollbackManagerBase() {
bool SyncRollbackManagerBase::InitInternal(
const base::FilePath& database_location,
InternalComponentsFactory* internal_components_factory,
+ InternalComponentsFactory::StorageOption storage,
scoped_ptr<UnrecoverableErrorHandler> unrecoverable_error_handler,
ReportUnrecoverableErrorFunction report_unrecoverable_error_function) {
unrecoverable_error_handler_ = unrecoverable_error_handler.Pass();
report_unrecoverable_error_function_ = report_unrecoverable_error_function;
- if (!InitBackupDB(database_location, internal_components_factory)) {
+ if (!InitBackupDB(database_location, internal_components_factory, storage)) {
NotifyInitializationFailure();
return false;
}
@@ -140,7 +140,6 @@ void SyncRollbackManagerBase::SaveChanges() {
void SyncRollbackManagerBase::ShutdownOnSyncThread(ShutdownReason reason) {
if (initialized_) {
- SaveChanges();
share_.directory->Close();
share_.directory.reset();
initialized_ = false;
@@ -239,12 +238,13 @@ scoped_ptr<base::ListValue> SyncRollbackManagerBase::GetAllNodesForType(
bool SyncRollbackManagerBase::InitBackupDB(
const base::FilePath& sync_folder,
- InternalComponentsFactory* internal_components_factory) {
+ InternalComponentsFactory* internal_components_factory,
+ InternalComponentsFactory::StorageOption storage) {
base::FilePath backup_db_path = sync_folder.Append(
syncable::Directory::kSyncDatabaseFilename);
scoped_ptr<syncable::DirectoryBackingStore> backing_store =
internal_components_factory->BuildDirectoryBackingStore(
- "backup", backup_db_path).Pass();
+ storage, "backup", backup_db_path).Pass();
DCHECK(backing_store.get());
share_.directory.reset(
« no previous file with comments | « sync/internal_api/sync_rollback_manager_base.h ('k') | sync/internal_api/sync_rollback_manager_base_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698