Revert of Let SyncBackupManager keep backup data in memory until shutdown. Only persist

sync/internal_api/sync_rollback_manager_base.cc

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 a2f14e4b90147cb709c125beb7f0c33328b54b11..67e152bf319e0ba636f6230974314c992fde85f9 100644
--- a/sync/internal_api/sync_rollback_manager_base.cc
+++ b/sync/internal_api/sync_rollback_manager_base.cc
@@ -5,6 +5,7 @@
 #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"
@@ -52,13 +53,12 @@
 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, storage)) {
+  if (!InitBackupDB(database_location, internal_components_factory)) {
     NotifyInitializationFailure();
     return false;
   }
@@ -140,6 +140,7 @@
 
 void SyncRollbackManagerBase::ShutdownOnSyncThread(ShutdownReason reason) {
   if (initialized_) {
+    SaveChanges();
     share_.directory->Close();
     share_.directory.reset();
     initialized_ = false;
@@ -238,13 +239,12 @@
 
 bool SyncRollbackManagerBase::InitBackupDB(
     const base::FilePath& sync_folder,
-    InternalComponentsFactory* internal_components_factory,
-    InternalComponentsFactory::StorageOption storage) {
+    InternalComponentsFactory* internal_components_factory) {
   base::FilePath backup_db_path = sync_folder.Append(
       syncable::Directory::kSyncDatabaseFilename);
   scoped_ptr<syncable::DirectoryBackingStore> backing_store =
       internal_components_factory->BuildDirectoryBackingStore(
-          storage, "backup", backup_db_path).Pass();
+          "backup", backup_db_path).Pass();
 
   DCHECK(backing_store.get());
   share_.directory.reset(