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

sync/internal_api/sync_backup_manager.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sync/internal_api/sync_backup_manager.h"
 
 #include "sync/internal_api/public/read_node.h"
 #include "sync/internal_api/public/write_transaction.h"
 #include "sync/syncable/directory.h"
 #include "sync/syncable/mutable_entry.h"
 #include "url/gurl.h"
 
 namespace syncer {
 
 SyncBackupManager::SyncBackupManager()
     : in_normalization_(false) {
 }
 
 SyncBackupManager::~SyncBackupManager() {
 }
 
 void SyncBackupManager::Init(InitArgs* args) {
   if (SyncRollbackManagerBase::InitInternal(
           args->database_location,
           args->internal_components_factory.get(),
-          InternalComponentsFactory::STORAGE_ON_DISK_DEFERRED,
           args->unrecoverable_error_handler.Pass(),
           args->report_unrecoverable_error_function)) {
     GetUserShare()->directory->CollectMetaHandleCounts(
         &status_.num_entries_by_type, &status_.num_to_delete_entries_by_type);
 
     HideSyncPreference(PRIORITY_PREFERENCES);
     HideSyncPreference(PREFERENCES);
   }
 }
 
 void SyncBackupManager::SaveChanges() {
-  if (initialized())
+  if (initialized()) {
     NormalizeEntries();
+    GetUserShare()->directory->SaveChanges();
+  }
 }
 
 SyncStatus SyncBackupManager::GetDetailedStatus() const {
   return status_;
 }
 
 ModelTypeSet SyncBackupManager::HandleTransactionEndingChangeEvent(
     const syncable::ImmutableWriteTransactionInfo& write_transaction_info,
     syncable::BaseTransaction* trans) {
   ModelTypeSet types;
@@ skipping 64 matching lines @@
       entry.PutIsUnsynced(false);
 
       // Don't persist on disk so that if backup is aborted before receiving
       // local preference values, values in sync DB are saved.
       GetUserShare()->directory->UnmarkDirtyEntry(
           trans.GetWrappedWriteTrans(), &entry);
     }
   }
 }
 
-void SyncBackupManager::ShutdownOnSyncThread(ShutdownReason reason) {
-  if (reason == SWITCH_MODE_SYNC) {
-    NormalizeEntries();
-    GetUserShare()->directory->SaveChanges();
-  }
-
-  SyncRollbackManagerBase::ShutdownOnSyncThread(reason);
-}
-
 void SyncBackupManager::RegisterDirectoryTypeDebugInfoObserver(
     syncer::TypeDebugInfoObserver* observer) {}
 
 void SyncBackupManager::UnregisterDirectoryTypeDebugInfoObserver(
     syncer::TypeDebugInfoObserver* observer) {}
 
 bool SyncBackupManager::HasDirectoryTypeDebugInfoObserver(
     syncer::TypeDebugInfoObserver* observer) { return false; }
 
 void SyncBackupManager::RequestEmitDebugInfo() {}
 
 }  // namespace syncer