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

sync/internal_api/test/test_internal_components_factory.cc

Index: sync/internal_api/test/test_internal_components_factory.cc
diff --git a/sync/internal_api/test/test_internal_components_factory.cc b/sync/internal_api/test/test_internal_components_factory.cc
index 34c678be6e997d4035e1853f1920aee68508f0fc..c7d94e9b513d34a27786dd5c67ea7481bf087f9a 100644
--- a/sync/internal_api/test/test_internal_components_factory.cc
+++ b/sync/internal_api/test/test_internal_components_factory.cc
@@ -5,7 +5,6 @@
 #include "sync/internal_api/public/test/test_internal_components_factory.h"
 
 #include "sync/sessions/sync_session_context.h"
-#include "sync/syncable/deferred_on_disk_directory_backing_store.h"
 #include "sync/syncable/in_memory_directory_backing_store.h"
 #include "sync/syncable/on_disk_directory_backing_store.h"
 #include "sync/syncable/invalid_directory_backing_store.h"
@@ -15,11 +14,9 @@
 
 TestInternalComponentsFactory::TestInternalComponentsFactory(
     const Switches& switches,
-    StorageOption option,
-    StorageOption* storage_used)
+    StorageOption option)
     : switches_(switches),
-      storage_override_(option),
-      storage_used_(storage_used) {
+      storage_option_(option) {
 }
 
 TestInternalComponentsFactory::~TestInternalComponentsFactory() { }
@@ -57,12 +54,8 @@
 
 scoped_ptr<syncable::DirectoryBackingStore>
 TestInternalComponentsFactory::BuildDirectoryBackingStore(
-    StorageOption storage, const std::string& dir_name,
-    const base::FilePath& backing_filepath) {
-  if (storage_used_)
-    *storage_used_ = storage;
-
-  switch (storage_override_) {
+      const std::string& dir_name, const base::FilePath& backing_filepath) {
+  switch (storage_option_) {
     case STORAGE_IN_MEMORY:
       return scoped_ptr<syncable::DirectoryBackingStore>(
           new syncable::InMemoryDirectoryBackingStore(dir_name));
@@ -70,10 +63,6 @@
       return scoped_ptr<syncable::DirectoryBackingStore>(
           new syncable::OnDiskDirectoryBackingStore(dir_name,
                                                     backing_filepath));
-    case STORAGE_ON_DISK_DEFERRED:
-      return scoped_ptr<syncable::DirectoryBackingStore>(
-          new syncable::DeferredOnDiskDirectoryBackingStore(dir_name,
-                                                            backing_filepath));
     case STORAGE_INVALID:
       return scoped_ptr<syncable::DirectoryBackingStore>(
           new syncable::InvalidDirectoryBackingStore());