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

sync/internal_api/sync_rollback_manager_base.h

 // 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.
 
 #ifndef SYNC_INTERNAL_API_SYNC_ROLLBACK_MANAGER_BASE_H_
 #define SYNC_INTERNAL_API_SYNC_ROLLBACK_MANAGER_BASE_H_
 
 #include <string>
 #include <vector>
 
 #include "sync/base/sync_export.h"
 #include "sync/internal_api/public/http_post_provider_factory.h"
-#include "sync/internal_api/public/internal_components_factory.h"
 #include "sync/internal_api/public/sync_manager.h"
 #include "sync/internal_api/public/user_share.h"
 #include "sync/syncable/directory_change_delegate.h"
 #include "sync/syncable/transaction_observer.h"
 
 namespace syncer {
 
 class WriteTransaction;
 
 // Base class of sync managers used for backup and rollback. Two major
@@ skipping 69 matching lines @@
       const syncable::ImmutableWriteTransactionInfo& write_transaction_info,
       ModelTypeSet models_with_changes) OVERRIDE;
 
  protected:
   ObserverList<SyncManager::Observer>* GetObservers();
 
   // Initialize sync backup DB.
   bool InitInternal(
       const base::FilePath& database_location,
       InternalComponentsFactory* internal_components_factory,
-      InternalComponentsFactory::StorageOption storage,
       scoped_ptr<UnrecoverableErrorHandler> unrecoverable_error_handler,
       ReportUnrecoverableErrorFunction report_unrecoverable_error_function);
 
   virtual void RegisterDirectoryTypeDebugInfoObserver(
       syncer::TypeDebugInfoObserver* observer) OVERRIDE;
   virtual void UnregisterDirectoryTypeDebugInfoObserver(
       syncer::TypeDebugInfoObserver* observer) OVERRIDE;
   virtual bool HasDirectoryTypeDebugInfoObserver(
       syncer::TypeDebugInfoObserver* observer) OVERRIDE;
   virtual void RequestEmitDebugInfo() OVERRIDE;
 
   bool initialized() const {
     return initialized_;
   }
 
  private:
   void NotifyInitializationSuccess();
   void NotifyInitializationFailure();
 
-  bool InitBackupDB(const base::FilePath& sync_folder,
-                    InternalComponentsFactory* internal_components_factory,
-                    InternalComponentsFactory::StorageOption storage);
+  bool InitBackupDB(
+      const base::FilePath& sync_folder,
+      InternalComponentsFactory* internal_components_factory);
 
   bool InitTypeRootNode(ModelType type);
   void InitBookmarkFolder(const std::string& folder);
 
   UserShare share_;
   ObserverList<SyncManager::Observer> observers_;
 
   scoped_ptr<UnrecoverableErrorHandler> unrecoverable_error_handler_;
   ReportUnrecoverableErrorFunction report_unrecoverable_error_function_;
 
   base::WeakPtrFactory<SyncRollbackManagerBase> weak_ptr_factory_;
 
   scoped_ptr<SyncEncryptionHandler> dummy_handler_;
 
   bool initialized_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncRollbackManagerBase);
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_INTERNAL_API_SYNC_ROLLBACK_MANAGER_BASE_H_