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

sync/internal_api/internal_components_factory_impl.cc

Index: sync/internal_api/internal_components_factory_impl.cc
diff --git a/sync/internal_api/internal_components_factory_impl.cc b/sync/internal_api/internal_components_factory_impl.cc
index dbc424374a9b5020f36389df45aa8843b0ea8c21..e764a1698ab6c25ebad48d8ac4181c9b511355ea 100644
--- a/sync/internal_api/internal_components_factory_impl.cc
+++ b/sync/internal_api/internal_components_factory_impl.cc
@@ -8,7 +8,6 @@
 #include "sync/engine/syncer.h"
 #include "sync/engine/sync_scheduler_impl.h"
 #include "sync/sessions/sync_session_context.h"
-#include "sync/syncable/deferred_on_disk_directory_backing_store.h"
 #include "sync/syncable/on_disk_directory_backing_store.h"
 
 using base::TimeDelta;
@@ -60,19 +59,9 @@
 
 scoped_ptr<syncable::DirectoryBackingStore>
 InternalComponentsFactoryImpl::BuildDirectoryBackingStore(
-    StorageOption storage, const std::string& dir_name,
-    const base::FilePath& backing_filepath) {
-  if (storage == STORAGE_ON_DISK) {
-    return scoped_ptr<syncable::DirectoryBackingStore>(
-        new syncable::OnDiskDirectoryBackingStore(dir_name, backing_filepath));
-  } else if (storage == STORAGE_ON_DISK_DEFERRED) {
-    return scoped_ptr<syncable::DirectoryBackingStore>(
-        new syncable::DeferredOnDiskDirectoryBackingStore(dir_name,
-                                                          backing_filepath));
-  } else {
-    NOTREACHED();
-    return scoped_ptr<syncable::DirectoryBackingStore>();
-  }
+      const std::string& dir_name, const base::FilePath& backing_filepath) {
+  return scoped_ptr<syncable::DirectoryBackingStore>(
+      new syncable::OnDiskDirectoryBackingStore(dir_name, backing_filepath));
 }
 
 InternalComponentsFactory::Switches