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

sync/internal_api/public/test/test_internal_components_factory.h

Index: sync/internal_api/public/test/test_internal_components_factory.h
diff --git a/sync/internal_api/public/test/test_internal_components_factory.h b/sync/internal_api/public/test/test_internal_components_factory.h
index 0c6b9095120b0000eac05c0d0fd3d659551cb0a4..3b7d3c5a87741c140bca9121fce6d32cd231bf90 100644
--- a/sync/internal_api/public/test/test_internal_components_factory.h
+++ b/sync/internal_api/public/test/test_internal_components_factory.h
@@ -9,11 +9,20 @@
 
 namespace syncer {
 
+enum StorageOption {
+  // BuildDirectoryBackingStore should not use persistent on-disk storage.
+  STORAGE_IN_MEMORY,
+  // Use this if you want BuildDirectoryBackingStore to create a real
+  // on disk store.
+  STORAGE_ON_DISK,
+  // Use this to test the case where a directory fails to load.
+  STORAGE_INVALID
+};
+
 class TestInternalComponentsFactory : public InternalComponentsFactory {
  public:
   explicit TestInternalComponentsFactory(const Switches& switches,
-                                         StorageOption option,
-                                         StorageOption* storage_used);
+                                         StorageOption option);
   virtual ~TestInternalComponentsFactory();
 
   virtual scoped_ptr<SyncScheduler> BuildScheduler(
@@ -32,7 +41,6 @@
 
   virtual scoped_ptr<syncable::DirectoryBackingStore>
   BuildDirectoryBackingStore(
-      StorageOption storage,
       const std::string& dir_name,
       const base::FilePath& backing_filepath) OVERRIDE;
 
@@ -40,8 +48,7 @@
 
  private:
   const Switches switches_;
-  const StorageOption storage_override_;
-  StorageOption* storage_used_;
+  const StorageOption storage_option_;
 
   DISALLOW_COPY_AND_ASSIGN(TestInternalComponentsFactory);
 };